]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7011-skip-worktree-reading.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commite57caee004362ee855a3bc8fc826abe251eb64f8
treed6b8c29059cff7a5225e830729e70ab7afa018d7tree | snapshot
parent78d15022e741b8f237b83d3f4bb8543674d9693dcommit | diff
parent209d9cb0114dff72e96d58bb3c27409660f1b45ccommit | diff
Merge branch 'pg/diff-stat-unmerged-regression-fix'

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
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.