'Cherry-pick' commits after combined commits when combine is done

[tortoisegit/TortoiseGitJp.git] / src / Git / GitStatusListCtrl.h

diff --git a/src/Git/GitStatusListCtrl.h b/src/Git/GitStatusListCtrl.h
index 70938f3..13d5733 100644 (file)
--- a/src/Git/GitStatusListCtrl.h
+++ b/src/Git/GitStatusListCtrl.h
@@ -55,8 +55,8 @@
                \r
 #define SVNSLC_SHOWUNVERSIONED CTGitPath::LOGACTIONS_UNVER\r
 #define SVNSLC_SHOWNORMAL              0x000000000\r
-#define SVNSLC_SHOWMODIFIED            CTGitPath::LOGACTIONS_MODIFIED\r
-#define SVNSLC_SHOWADDED               CTGitPath::LOGACTIONS_ADDED\r
+#define SVNSLC_SHOWMODIFIED            (CTGitPath::LOGACTIONS_MODIFIED)\r
+#define SVNSLC_SHOWADDED               (CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY)\r
 #define SVNSLC_SHOWREMOVED             CTGitPath::LOGACTIONS_DELETED\r
 #define SVNSLC_SHOWCONFLICTED  CTGitPath::LOGACTIONS_UNMERGED\r
 #define SVNSLC_SHOWMISSING             0x00000000\r
@@ -514,7 +514,7 @@ public:
         * \param bUpdate TRUE if the remote status is requested too.\r
         * \return TRUE on success.\r
         */\r
-       BOOL GetStatus ( const CTGitPathList& pathList\r
+       BOOL GetStatus ( const CTGitPathList* pathList=NULL\r
                    , bool bUpdate = false\r
                    , bool bShowIgnores = false\r
                                   , bool bShowUnRev=false\r