diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-29 18:14:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-01 12:00:01 -0800 |
| commit | eb1d0d6b27e15c6a8c7c3b1ec10be19998da23a6 (patch) | |
| tree | afdd0617dd5c9d5970e52c8027a79d68155e2116 /diff.h | |
| parent | b3f01ff29f7131e959bcfdfd004744d74d5fa319 (diff) | |
| download | git-jc/diff-ignore-mode.tar.gz | |
diff --ignore-mode-changejc/diff-ignore-mode
It may be useful if you can view the diff while ignoring changes that only
touch the executable bit without changing the contents (e.g. a careless
imports of vendor drop from tarballs), and this teaches the diff machinery
to ignore them. A change that touches both contents and the executable bit
is not ignored.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -78,6 +78,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data) #define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25) #define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26) #define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27) +#define DIFF_OPT_IGNORE_MODE_CHANGE (1 << 30) #define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag) #define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag) |