diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-02 21:17:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 21:17:44 (GMT) |
| commit | 1ae0949a036864de1f5caa7b375b875284d1c69e (patch) | |
| tree | 800b0226c23ed0596f38507d4d4ad8818307a94e /Documentation | |
| parent | c23cd78e8127a2f80cc0357994209bc1bb81a4fe (diff) | |
| parent | 296d4a94e7231a1d57356889f51bff57a1a3c5a1 (diff) | |
| download | git-1ae0949a036864de1f5caa7b375b875284d1c69e.zip git-1ae0949a036864de1f5caa7b375b875284d1c69e.tar.gz git-1ae0949a036864de1f5caa7b375b875284d1c69e.tar.bz2 | |
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 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 573fb9b..ee52b65 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -687,6 +687,11 @@ endif::git-format-patch[] --ignore-blank-lines:: Ignore changes whose lines are all blank. +-I<regex>:: +--ignore-matching-lines=<regex>:: + Ignore changes whose all lines match <regex>. This option may + be specified more than once. + --inter-hunk-context=<lines>:: Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. |