From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Oct 2025 17:29:29 +0000 (-0700)
Subject: Merge branch 'ly/diff-name-only-with-diff-from-content' into maint-2.51
X-Git-Tag: v2.51.1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77f8e1002be5c736e064ed0e656ba51c82d85b5d;p=thirdparty%2Fgit.git

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
---

77f8e1002be5c736e064ed0e656ba51c82d85b5d