diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-30 20:16:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-30 20:16:26 -0700 |
| commit | d39d667169fda640065d48b70288c3342bd3195d (patch) | |
| tree | fda6348bfc52ac132837c3f6816addb8bf85c20e /diff.h | |
| parent | e3de372e135e765749426a0165e893283192e38c (diff) | |
| parent | 86140d56c150aa17e6c98dde4ba669516f3c302a (diff) | |
| download | git-d39d667169fda640065d48b70288c3342bd3195d.tar.gz | |
Merge branch 'js/diff-verbose-submodule'
* js/diff-verbose-submodule:
add tests for git diff --submodule
Add the --submodule option to the diff option family
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -66,6 +66,9 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, #define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19) #define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20) #define DIFF_OPT_ALLOW_TEXTCONV (1 << 21) + +#define DIFF_OPT_SUBMODULE_LOG (1 << 23) + #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) |