mirror of
https://github.com/git/git.git
synced 2024-11-25 10:54:00 +08:00
296d4a94e7
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> |
||
|---|---|---|
| .. | ||
| xdiff.h | ||
| xdiffi.c | ||
| xdiffi.h | ||
| xemit.c | ||
| xemit.h | ||
| xhistogram.c | ||
| xinclude.h | ||
| xmacros.h | ||
| xmerge.c | ||
| xpatience.c | ||
| xprepare.c | ||
| xprepare.h | ||
| xtypes.h | ||
| xutils.c | ||
| xutils.h | ||