summaryrefslogtreecommitdiff
path: root/t/t4018/elixir-do-not-pick-end
diff options
context:
space:
mode:
authorLibravatar Michał Kępień <michal@isc.org>2020-10-20 08:48:09 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-10-20 12:53:26 -0700
commit296d4a94e7231a1d57356889f51bff57a1a3c5a1 (patch)
tree85fa1fa7d7ed82a83298e1c5a26071015e175684 /t/t4018/elixir-do-not-pick-end
parentmerge-base, xdiff: zero out xpparam_t structures (diff)
downloadtgif-296d4a94e7231a1d57356889f51bff57a1a3c5a1.tar.xz
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 't/t4018/elixir-do-not-pick-end')
0 files changed, 0 insertions, 0 deletions