The sixth batch

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jul 22, 2022 at 15:03 UTC 6a475b71f8c4ce708d69fdc9317aefbde3769e25
1 file changed +16 -1
Documentation/RelNotes/2.38.0.txt
+16 -1
@@ -27,6 +27,9 @@ UI, Workflows & Features
27 what locale they are in by sending Accept-Language HTTP header, but
28 this was done only for some requests but not others.
29
30 + * Introduce a discovery.barerepository configuration variable that
31 + allows users to forbid discovery of bare repositories.
32 +
33
34 Performance, Internal Implementation, Development Support etc.
35
@@ -78,7 +81,6 @@ Fixes since v2.37
81
82 * Rewrite of "git add -i" in C that appeared in Git 2.25 didn't
83 correctly record a removed file to the index, which was fixed.
81 - (merge 4788e8b256 js/add-i-delete later to maint).
84
85 * Certain diff options are currently ignored when combined-diff is
86 shown; mark them as incompatible with the feature.
@@ -141,6 +143,19 @@ Fixes since v2.37
143 at a bogus place, which as been corrected.
144 (merge 04393ae7f7 jk/diff-files-cleanup-fix later to maint).
145
146 + * Variable quoting fix in the vimdiff driver of "git mergetool"
147 + (merge ccc7b5148b js/vimdiff-quotepath-fix later to maint).
148 +
149 + * "git shortlog -n" relied on the underlying qsort() to be stable,
150 + which shouldn't have. Fixed.
151 + (merge df534dcbaa js/shortlog-sort-stably later to maint).
152 +
153 + * A fix for a regression in test framework.
154 + (merge 7253f7ca9f js/ci-github-workflow-markup later to maint).
155 +
156 + * mkstemp() emulation on Windows has been improved.
157 + (merge ae25974de3 rs/mingw-tighten-mkstemp later to maint).
158 +
159 * Other code cleanup, docfix, build fix, etc.
160 (merge 5fd9d1738e jk/revisions-doc-markup-fix later to maint).
161 (merge 1971510c35 pb/diff-doc-raw-format later to maint).