]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78d1502 209d9cb)
Merge branch 'pg/diff-stat-unmerged-regression-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Dec 2022 02:42:07 +0000 (11:42 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Dec 2022 02:42:07 +0000 (11:42 +0900)
The output from "git diff --stat" on an unmerged path lost the
terminating LF in Git 2.39, which has been corrected.

* pg/diff-stat-unmerged-regression-fix:
  diff: fix regression with --stat and unmerged file

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.