From eb1d0d6b27e15c6a8c7c3b1ec10be19998da23a6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 29 Feb 2012 18:14:17 -0800 Subject: diff --ignore-mode-change 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 --- diff.h | 1 + 1 file changed, 1 insertion(+) (limited to 'diff.h') diff --git a/diff.h b/diff.h index 0083d92438..9f10f72e0a 100644 --- a/diff.h +++ b/diff.h @@ -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) -- cgit v1.2.1