]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
diff.c patch | diff1 | diff2 | blob | history

diff --cc diff.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.