From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Oct 2025 18:40:15 +0000 (-0700)
Subject: Merge branch 'ly/diff-name-only-with-diff-from-content' into jk/diff-from-contents-fix
X-Git-Tag: v2.51.2~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e0a3e8f8f9e160b21fbe6f3f11a11dbed15fb4e;p=thirdparty%2Fgit.git

Merge branch 'ly/diff-name-only-with-diff-from-content' into jk/diff-from-contents-fix

* ly/diff-name-only-with-diff-from-content:
  diff: ensure consistent diff behavior with ignore options
---

1e0a3e8f8f9e160b21fbe6f3f11a11dbed15fb4e