]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ly/diff-name-only-with-diff-from-content' into jk/diff-from-contents-fix
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Oct 2025 18:40:15 +0000 (11:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Oct 2025 18:40:15 +0000 (11:40 -0700)
commit1e0a3e8f8f9e160b21fbe6f3f11a11dbed15fb4e
treef72301557649cd895d16b15bce21ef6b47fb36ca
parentc44beea485f0f2feaf460e2ac87fdd5608d63cf0
parentb55e6d36ebce69136559add8fffd1a65df231518
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