OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Git 1.8.3.2
[git-core/git.git]
/
revision.h
diff --git
a/revision.h
b/revision.h
index
01bd2b7
..
878a555
100644
(file)
--- a/
revision.h
+++ b/
revision.h
@@
-35,6
+35,7
@@
struct rev_cmdline_info {
REV_CMD_PARENTS_ONLY,
REV_CMD_LEFT,
REV_CMD_RIGHT,
+ REV_CMD_MERGE_BASE,
REV_CMD_REV
} whence;
unsigned flags;