summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-11-04 19:24:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-11-04 19:24:46 (GMT)
commit88d915a634b449147855041d44875322de2b286d (patch)
tree6e7e4150797723382107829bd35ad04ff04fba81
parent9cc14a5b5dbbd54cce916d7d3e963a5b15e1e889 (diff)
downloadgit-88d915a634b449147855041d44875322de2b286d.zip
git-88d915a634b449147855041d44875322de2b286d.tar.gz
git-88d915a634b449147855041d44875322de2b286d.tar.bz2
A few fixes before -rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.34.0.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.34.0.txt b/Documentation/RelNotes/2.34.0.txt
index f6d5834..7aa14f8 100644
--- a/Documentation/RelNotes/2.34.0.txt
+++ b/Documentation/RelNotes/2.34.0.txt
@@ -401,6 +401,13 @@ Fixes since v2.33
object replacement.
(merge 095d112f8c ab/ignore-replace-while-working-on-commit-graph later to maint).
+ * "git pull --no-verify" did not affect the underlying "git merge".
+ (merge 47bfdfb3fd ar/fix-git-pull-no-verify later to maint).
+
+ * One CI task based on Fedora image noticed a not-quite-kosher
+ consturct recently, which has been corrected.
+ (merge 4b540cf913 vd/pthread-setspecific-g11-fix later to maint).
+
* Other code cleanup, docfix, build fix, etc.
(merge f188160be9 ab/bundle-remove-verbose-option later to maint).
(merge 8c6b4332b4 rs/close-pack-leakfix later to maint).