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

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

diff --git a/src/Git/TGitPath.h b/src/Git/TGitPath.h
index 2de7577..cbb9256 100644 (file)
--- a/src/Git/TGitPath.h
+++ b/src/Git/TGitPath.h
@@ -17,9 +17,25 @@ public:
                LOGACTIONS_DELETED      = 0x00000008,\r
                LOGACTIONS_UNMERGED = 0x00000010,\r
                LOGACTIONS_CACHE        = 0x00000020,\r
+               LOGACTIONS_COPY         = 0x00000040,\r
                LOGACTIONS_UNVER        = 0x80000000,\r
                LOGACTIONS_IGNORE       = 0x40000000,\r
                //LOGACTIONS_CONFLICT = 0x20000000,\r
+               \r
+               // For log filter only\r
+               LOGACTIONS_HIDE         = 0x20000000,\r
+               LOGACTIONS_GRAY         = 0x10000000,\r
+\r
+               // For Rebase only\r
+               LOGACTIONS_REBASE_CURRENT = 0x08000000,\r
+               LOGACTIONS_REBASE_PICK    = 0x04000000,\r
+               LOGACTIONS_REBASE_SQUASH  = 0x02000000,\r
+               LOGACTIONS_REBASE_EDIT    = 0x01000000,\r
+               LOGACTIONS_REBASE_DONE    = 0x00800000,\r
+               LOGACTIONS_REBASE_SKIP    = 0x00400000,\r
+               LOGACTIONS_REBASE_MASK    = 0x0FC00000,\r
+               LOGACTIONS_REBASE_MODE_MASK=0x07C00000,\r
+\r
        };\r
 \r
        CString m_StatAdd;\r
@@ -28,6 +44,7 @@ public:
        bool    m_Checked;\r
        int     ParserAction(BYTE action);\r
        CString GetActionName();\r
+       static CString GetActionName(int action);\r
        /**\r
         * Set the path as an UTF8 string with forward slashes\r
         */\r