Git 2.34
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Nov 14, 2021 at 22:50 UTC
cd3e606211bb1cf8bc57f7d76bab98cc17a150bc
2 files changed
+3
-5
Documentation/RelNotes/2.34.0.txt
+2
-4
@@ -15,7 +15,8 @@ UI, Workflows & Features
15
location relative to Git installation (e.g. its $sharedir which is
16
$(prefix)/share), with "%(prefix)".
17
18
- * Use `ort` instead of `recursive` as the default merge strategy.
18
+ * The `ort` strategy is used instead of `recursive` as the default
19
+ merge strategy.
20
21
* The userdiff pattern for "java" language has been updated.
22
@@ -390,7 +391,6 @@ Fixes since v2.33
391
(merge 8252ec300e jc/branch-copy-doc later to maint).
392
393
* Squelch over-eager warning message added during this cycle.
393
- (merge 9e8fe7b1c7 jk/log-warn-on-bogus-encoding later to maint).
394
395
* Fix long-standing shell syntax error in the completion script.
396
(merge 46b0585286 re/completion-fix-test-equality later to maint).
@@ -405,7 +405,6 @@ Fixes since v2.33
405
406
* One CI task based on Fedora image noticed a not-quite-kosher
407
construct recently, which has been corrected.
408
- (merge 4b540cf913 vd/pthread-setspecific-g11-fix later to maint).
408
409
* "git pull --ff-only" and "git pull --rebase --ff-only" should make
410
it a no-op to attempt pulling from a remote that is behind us, but
@@ -435,6 +434,5 @@ Fixes since v2.33
434
(merge 8650c6298c ab/fix-make-lint-docs later to maint).
435
(merge 1c720357ce ab/test-lib-diff-cleanup later to maint).
436
(merge 6b615dbece ks/submodule-add-message-fix later to maint).
438
- (merge 82a57cd13f ma/doc-git-version later to maint).
437
(merge 203eb8381a jc/doc-format-patch-clarify-auto-base later to maint).
438
(merge 559664c792 ab/test-lib later to maint).
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v2.34.0-rc2
4
+DEF_VER=v2.34.0
5
6
LF='
7
'