The seventh batch

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

Junio C Hamano committed Jan 16, 2023 at 10:56 UTC 262c45b6a17d971cd440c6cd2fdeff1e0d081e47
1 file changed +21
Documentation/RelNotes/2.40.0.txt
+21
@@ -29,6 +29,12 @@ UI, Workflows & Features
29 * 'cat-file' gains mailmap support for its '--batch-check' and '-s'
30 options.
31
32 + * Conditionally skip the pre-applypatch and applypatch-msg hooks when
33 + applying patches with 'git am'.
34 +
35 + * Introduce an optional configuration to allow the trailing hash that
36 + protects the index file from bit flipping.
37 +
38
39 Performance, Internal Implementation, Development Support etc.
40
@@ -62,6 +68,10 @@ Performance, Internal Implementation, Development Support etc.
68 lose CRLF vs LF?" later, at which time we may be able to further
69 clean this up by replacing "git diff --no-index" with "diff -u".
70
71 + * Avoid unnecessary builds in CI, with settings configured in
72 + ci-config.
73 + (merge eb5b03a9c0 tb/ci-concurrency later to maint).
74 +
75
76 Fixes since v2.39
77 -----------------
@@ -122,6 +132,15 @@ Fixes since v2.39
132 * Fix to a small regression in 2.38 days.
133 (merge 6d5e9e53aa ab/bundle-wo-args later to maint).
134
135 + * "git diff --relative" did not mix well with "git diff --ext-diff",
136 + which has been corrected.
137 + (merge f034bb1cad jk/ext-diff-with-relative later to maint).
138 +
139 + * The logic to see if we are using the "cone" mode by checking the
140 + sparsity patterns has been tightened to avoid mistaking a pattern
141 + that names a single file as specifying a cone.
142 + (merge 5842710dc2 ws/single-file-cone later to maint).
143 +
144 * Other code cleanup, docfix, build fix, etc.
145 (merge 77e04b2ed4 rs/t4205-do-not-exit-in-test-script later to maint).
146 (merge faebba436e rs/plug-pattern-list-leak-in-lof later to maint).
@@ -141,3 +160,5 @@ Fixes since v2.39
160 (merge 4eb1ccecd4 dh/mingw-ownership-check-typofix later to maint).
161 (merge f95526419b ar/typofix-gitattributes-doc later to maint).
162 (merge 27875aeec9 km/doc-branch-start-point later to maint).
163 + (merge 35c194dc57 es/t1509-root-fixes later to maint).
164 + (merge 7b341645e3 pw/ci-print-failure-name-fix later to maint).