]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 81f86aa 623f7af)
Merge branch 'jk/diff-from-contents-fix' into maint-2.51
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Oct 2025 02:48:18 +0000 (19:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Oct 2025 02:48:18 +0000 (19:48 -0700)
commite56c419347fa07bfc00b98fd70f4a4c526b75c8f
treeb9287cb4f61056fe7bdc50b43bae96c450126818tree | snapshot
parent81f86aacc4eb74cdb9c2c8082d36d2070c666045commit | diff
parent623f7af28417805d941b1618157b9d93c02347afcommit | diff
Merge branch 'jk/diff-from-contents-fix' into maint-2.51

Recently we attempted to improve "git diff -w" and friends to
handle cases where patch output would be suppressed, but it
introduced a bug that emits unnecessary output, which has been
corrected.

* jk/diff-from-contents-fix:
  diff: restore redirection to /dev/null for diff_from_contents
Unnamed repository; edit this file 'description' to name the repository.