undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Git 2.34

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2021-11-14 22:50:52 -08:00
parent a288957a40
commit cd3e606211
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/RelNotes/2.34.0.txt
View File

@ -15,7 +15,8 @@ UI, Workflows & Features
location relative to Git installation (e.g. its $sharedir which is location relative to Git installation (e.g. its $sharedir which is
$(prefix)/share), with "%(prefix)". $(prefix)/share), with "%(prefix)".
* Use `ort` instead of `recursive` as the default merge strategy. * The `ort` strategy is used instead of `recursive` as the default
merge strategy.
* The userdiff pattern for "java" language has been updated. * The userdiff pattern for "java" language has been updated.
@ -390,7 +391,6 @@ Fixes since v2.33
(merge 8252ec300e jc/branch-copy-doc later to maint). (merge 8252ec300e jc/branch-copy-doc later to maint).
* Squelch over-eager warning message added during this cycle. * Squelch over-eager warning message added during this cycle.
(merge 9e8fe7b1c7 jk/log-warn-on-bogus-encoding later to maint).
* Fix long-standing shell syntax error in the completion script. * Fix long-standing shell syntax error in the completion script.
(merge 46b0585286 re/completion-fix-test-equality later to maint). (merge 46b0585286 re/completion-fix-test-equality later to maint).
@ -405,7 +405,6 @@ Fixes since v2.33
* One CI task based on Fedora image noticed a not-quite-kosher * One CI task based on Fedora image noticed a not-quite-kosher
construct recently, which has been corrected. construct recently, which has been corrected.
(merge 4b540cf913 vd/pthread-setspecific-g11-fix later to maint).
* "git pull --ff-only" and "git pull --rebase --ff-only" should make * "git pull --ff-only" and "git pull --rebase --ff-only" should make
it a no-op to attempt pulling from a remote that is behind us, but it a no-op to attempt pulling from a remote that is behind us, but
@ -435,6 +434,5 @@ Fixes since v2.33
(merge 8650c6298c ab/fix-make-lint-docs later to maint). (merge 8650c6298c ab/fix-make-lint-docs later to maint).
(merge 1c720357ce ab/test-lib-diff-cleanup later to maint). (merge 1c720357ce ab/test-lib-diff-cleanup later to maint).
(merge 6b615dbece ks/submodule-add-message-fix later to maint). (merge 6b615dbece ks/submodule-add-message-fix later to maint).
(merge 82a57cd13f ma/doc-git-version later to maint).
(merge 203eb8381a jc/doc-format-patch-clarify-auto-base later to maint). (merge 203eb8381a jc/doc-format-patch-clarify-auto-base later to maint).
(merge 559664c792 ab/test-lib later to maint). (merge 559664c792 ab/test-lib later to maint).

2
GIT-VERSION-GEN
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
GVF=GIT-VERSION-FILE GVF=GIT-VERSION-FILE
DEF_VER=v2.34.0-rc2 DEF_VER=v2.34.0
LF=' LF='
' '