diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-03-25 20:23:27 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-25 15:09:49 -0700 |
| commit | 1b32decefd840e0ca5d18eefd6472fd8624dd849 (patch) | |
| tree | 4faa70e96564653ee1c31dff5a1312bfb1110d2d /revision.h | |
| parent | 208acbfb82f722fb22320c381e7da8c8fb2e37e8 (diff) | |
| download | git-1b32decefd840e0ca5d18eefd6472fd8624dd849.tar.gz | |
log: add --show-linear-break to help see non-linear historynd/log-show-linear-break
Option explanation is in rev-list-options.txt. The interaction with -z
is left undecided.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/revision.h b/revision.h index 531fb0de42..b8f4bc9a76 100644 --- a/revision.h +++ b/revision.h @@ -19,7 +19,8 @@ #define SYMMETRIC_LEFT (1u<<8) #define PATCHSAME (1u<<9) #define BOTTOM (1u<<10) -#define ALL_REV_FLAGS ((1u<<11)-1) +#define TRACK_LINEAR (1u<<26) +#define ALL_REV_FLAGS (((1u<<11)-1) | TRACK_LINEAR) #define DECORATE_SHORT_REFS 1 #define DECORATE_FULL_REFS 2 @@ -138,6 +139,10 @@ struct rev_info { preserve_subject:1; unsigned int disable_stdin:1; unsigned int leak_pending:1; + /* --show-linear-break */ + unsigned int track_linear:1, + track_first_time:1, + linear:1; enum date_mode date_mode; @@ -196,6 +201,9 @@ struct rev_info { /* copies of the parent lists, for --full-diff display */ struct saved_parents *saved_parents_slab; + + struct commit_list *previous_parents; + const char *break_bar; }; extern int ref_excluded(struct string_list *, const char *path); |