diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-04 22:30:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-04 22:30:44 -0700 |
| commit | 80d12c23de4fbddfaee2f9bf7fe809f57d02e171 (patch) | |
| tree | 572105c1fe83cbe98645ea37ca7b6f6b7163e1ad /diff.h | |
| parent | 1b23adadf3adcf0074f61a498479a471964ab8c3 (diff) | |
| parent | a4d7d2c6dbc9e1294034171c31d87b24cf3b492e (diff) | |
| download | git-80d12c23de4fbddfaee2f9bf7fe809f57d02e171.tar.gz git-80d12c23de4fbddfaee2f9bf7fe809f57d02e171.tar.xz | |
Merge branch 'jc/maint-log-grep'
* jc/maint-log-grep:
log --author/--committer: really match only with name part
diff --cumulative is a sub-option of --dirstat
bash completion: Hide more plumbing commands
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -31,7 +31,6 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, #define DIFF_FORMAT_PATCH 0x0010 #define DIFF_FORMAT_SHORTSTAT 0x0020 #define DIFF_FORMAT_DIRSTAT 0x0040 -#define DIFF_FORMAT_CUMULATIVE 0x0080 /* These override all above */ #define DIFF_FORMAT_NAME 0x0100 @@ -64,6 +63,7 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, #define DIFF_OPT_CHECK_FAILED (1 << 16) #define DIFF_OPT_RELATIVE_NAME (1 << 17) #define DIFF_OPT_IGNORE_SUBMODULES (1 << 18) +#define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19) #define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag) #define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag) #define DIFF_OPT_CLR(opts, flag) ((opts)->flags &= ~DIFF_OPT_##flag) |