]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2dad35f b55e6d3)
Merge branch 'ly/diff-name-only-with-diff-from-content' into maint-2.51
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2025 17:29:29 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2025 17:29:29 +0000 (10:29 -0700)
commit77f8e1002be5c736e064ed0e656ba51c82d85b5d
tree9a23ed4398489b2f25a6cab195fc40f9af8d8d07tree | snapshot
parent2dad35f32f4ac69d53a426759209d44f4a09df55commit | diff
parentb55e6d36ebce69136559add8fffd1a65df231518commit | diff
Merge branch 'ly/diff-name-only-with-diff-from-content' into maint-2.51

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
Unnamed repository; edit this file 'description' to name the repository.