]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7bbe594 b55e6d3)
Merge branch 'ly/diff-name-only-with-diff-from-content'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Aug 2025 20:13:22 +0000 (13:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Aug 2025 20:13:22 +0000 (13:13 -0700)
commit244214e9b6fc35466bf050aa4d50771adc87d96f
treeca1396856ee804b44f02fb88f74951d5a6f925a8tree | snapshot
parent7bbe59425cb08c4f128b1080365a51c5fbc1026bcommit | diff
parentb55e6d36ebce69136559add8fffd1a65df231518commit | 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
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.