OSDN Git Service
(root)
/
tortoisegit
/
TortoiseGitJp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Show User and Email info at setting dialog
[tortoisegit/TortoiseGitJp.git]
/
src
/
TortoiseProc
/
RebaseDlg.h
diff --git
a/src/TortoiseProc/RebaseDlg.h
b/src/TortoiseProc/RebaseDlg.h
index
05523c8
..
581d3ef
100644
(file)
--- a/
src/TortoiseProc/RebaseDlg.h
+++ b/
src/TortoiseProc/RebaseDlg.h
@@
-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