diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:43 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:44 -0800 |
commit | 1ae0949a036864de1f5caa7b375b875284d1c69e (patch) | |
tree | 800b0226c23ed0596f38507d4d4ad8818307a94e /diff.h | |
parent | c23cd78e8127a2f80cc0357994209bc1bb81a4fe (diff) | |
parent | 296d4a94e7231a1d57356889f51bff57a1a3c5a1 (diff) |
Merge branch 'mk/diff-ignore-regex'
"git diff" family of commands learned the "-I<regex>" option to ignore hunks whose changed lines all match the given pattern. * mk/diff-ignore-regex: diff: add -I<regex> that ignores matching changes merge-base, xdiff: zero out xpparam_t structures
Diffstat (limited to 'diff.h')
-rw-r--r-- | diff.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/diff.h b/diff.h index fdd736cbab..9665e22006 100644 --- a/diff.h +++ b/diff.h @@ -234,6 +234,10 @@ struct diff_options { */ const char *pickaxe; + /* -I<regex> */ + regex_t **ignore_regex; + size_t ignore_regex_nr, ignore_regex_alloc; + const char *single_follow; const char *a_prefix, *b_prefix; const char *line_prefix; |