diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2011-03-07 13:31:40 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-09 13:50:54 -0800 |
| commit | adbbb31e0d3b4cc7845c6d23d21c00da51025208 (patch) | |
| tree | f14d1079e845a8c47826a8e6ceb86d6ea1ec06be /revision.h | |
| parent | 1df2d656cc442dc057e30b6fb130967e5ae19654 (diff) | |
| download | git-adbbb31e0d3b4cc7845c6d23d21c00da51025208.tar.gz git-adbbb31e0d3b4cc7845c6d23d21c00da51025208.tar.xz | |
revision.c: introduce --cherry-mark
for marking those commits which "--cherry-pick" would drop.
The marker for those commits is '=' because '-' denotes a boundary
commit already, even though 'git cherry' uses it.
Nonequivalent commits are denoted '+' unless '--left-right' is used.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/revision.h b/revision.h index 0e4b35e8e..d38f1355d 100644 --- a/revision.h +++ b/revision.h @@ -14,7 +14,8 @@ #define CHILD_SHOWN (1u<<6) #define ADDED (1u<<7) /* Parents already parsed and added? */ #define SYMMETRIC_LEFT (1u<<8) -#define ALL_REV_FLAGS ((1u<<9)-1) +#define PATCHSAME (1u<<9) +#define ALL_REV_FLAGS ((1u<<10)-1) #define DECORATE_SHORT_REFS 1 #define DECORATE_FULL_REFS 2 @@ -68,6 +69,7 @@ struct rev_info { reverse:1, reverse_output_stage:1, cherry_pick:1, + cherry_mark:1, bisect:1, ancestry_path:1, first_parent_only:1; |