diff options
| author | Michał Kępień <michal@isc.org> | 2020-10-20 08:48:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-20 21:53:26 +0200 |
| commit | 296d4a94e7231a1d57356889f51bff57a1a3c5a1 (patch) | |
| tree | 85fa1fa7d7ed82a83298e1c5a26071015e175684 /Documentation/diff-options.txt | |
| parent | merge-base, xdiff: zero out xpparam_t structures (diff) | |
| download | git-296d4a94e7231a1d57356889f51bff57a1a3c5a1.tar.xz git-296d4a94e7231a1d57356889f51bff57a1a3c5a1.zip | |
diff: add -I<regex> that ignores matching changes
Add a new diff option that enables ignoring changes whose all lines
(changed, removed, and added) match a given regular expression. This is
similar to the -I/--ignore-matching-lines option in standalone diff
utilities and can be used e.g. to ignore changes which only affect code
comments or to look for unrelated changes in commits containing a large
number of automatically applied modifications (e.g. a tree-wide string
replacement). The difference between -G/-S and the new -I option is
that the latter filters output on a per-change basis.
Use the 'ignore' field of xdchange_t for marking a change as ignored or
not. Since the same field is used by --ignore-blank-lines, identical
hunk emitting rules apply for --ignore-blank-lines and -I. These two
options can also be used together in the same git invocation (they are
complementary to each other).
Rename xdl_mark_ignorable() to xdl_mark_ignorable_lines(), to indicate
that it is logically a "sibling" of xdl_mark_ignorable_regex() rather
than its "parent".
Signed-off-by: Michał Kępień <michal@isc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
| -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 7987d72b02..012daf9452 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -681,6 +681,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. |