The sixth batch

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

Junio C Hamano committed Sep 15, 2021 at 13:15 UTC 4c719308ce59dc70e606f910f40801f2c6051b24
1 file changed +30
Documentation/RelNotes/2.34.0.txt
+30
@@ -74,6 +74,12 @@ Performance, Internal Implementation, Development Support etc.
74 * Callers from older advice_config[] based API has been updated to
75 use the newer advice_if_enabled() and advice_enabled() API.
76
77 + * Teach "test_pause" and "debug" helpers to allow using the HOME and
78 + TERM environment variables the user usually uses.
79 +
80 + * "make INSTALL_STRIP=-s install" allows the installation step to use
81 + "install -s" to strip the binaries as they get installed.
82 +
83
84 Fixes since v2.33
85 -----------------
@@ -168,6 +174,27 @@ Fixes since v2.33
174 * Doc update plus improved error reporting.
175 (merge 1e93770888 jk/log-warn-on-bogus-encoding later to maint).
176
177 + * Recent "diff -m" changes broke "gitk", which has been corrected.
178 + (merge 5acffd3473 so/diff-index-regression-fix later to maint).
179 +
180 + * Regression fix.
181 + (merge b996f84989 ab/send-email-config-fix later to maint).
182 +
183 + * The "git apply -3" code path learned not to bother the lower level
184 + merge machinery when the three-way merge can be trivially resolved
185 + without the content level merge. This fixes a regression caused by
186 + recent "-3way first and fall back to direct application" change.
187 + (merge 57f183b698 jc/trivial-threeway-binary-merge later to maint).
188 +
189 + * The code that optionally creates the *.rev reverse index file has
190 + been optimized to avoid needless computation when it is not writing
191 + the file out.
192 + (merge 8fe8bae9d2 ab/reverse-midx-optim later to maint).
193 +
194 + * "git range-diff -I... <range> <range>" segfaulted, which has been
195 + corrected.
196 + (merge 709b3f32d3 rs/range-diff-avoid-segfault-with-I later to maint).
197 +
198 * Other code cleanup, docfix, build fix, etc.
199 (merge 1d9c8daef8 ab/bundle-doc later to maint).
200 (merge 81483fe613 en/merge-strategy-docs later to maint).
@@ -194,3 +221,6 @@ Fixes since v2.33
221 (merge e4f8d27585 rs/show-branch-simplify later to maint).
222 (merge e124ecf7f7 rs/archive-use-object-id later to maint).
223 (merge cebead1ebf cb/ci-build-pedantic later to maint).
224 + (merge ca0cc98e03 bs/doc-bugreport-outdir later to maint).
225 + (merge 72b113e562 ab/no-more-check-bindir later to maint).
226 + (merge 92a5d1c9b4 jc/prefix-filename-allocates later to maint).