OSDN Git Service

Show User and Email info at setting dialog
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / RebaseDlg.h
index 05523c8..581d3ef 100644 (file)
@@ -40,6 +40,7 @@ public:
                REBASE_EDIT,\r
                REBASE_SQUASH_EDIT,\r
                REBASE_SQUASH_CONFLICT,\r
+               REBASE_DONE,\r
        };\r
 \r
 protected:\r
@@ -86,6 +87,7 @@ protected:
 \r
        int CheckNextCommitIsSquash();\r
        int GetCurrentCommitID();\r
+       int FinishRebase();\r
 \r
 public:\r
    \r