summaryrefslogtreecommitdiff
path: root/merge-blobs.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-08-22 13:13:22 -0700
committerJunio C Hamano <gitster@pobox.com>2025-08-22 13:13:22 -0700
commit244214e9b6fc35466bf050aa4d50771adc87d96f (patch)
treeca1396856ee804b44f02fb88f74951d5a6f925a8 /merge-blobs.c
parent7bbe59425cb08c4f128b1080365a51c5fbc1026b (diff)
parentb55e6d36ebce69136559add8fffd1a65df231518 (diff)
Merge branch 'ly/diff-name-only-with-diff-from-content'
Various options to "git diff" that makes comparison ignore certain aspects of the differences (like "space changes are ignored", "differences in lines that match these regular expressions are ignored") did not work well with "--name-only" and friends. * ly/diff-name-only-with-diff-from-content: diff: ensure consistent diff behavior with ignore options
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions