From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Nov 2021 05:55:56 +0000 (-0800)
Subject: 0th batch for early fixes
X-Git-Tag: v2.35.0-rc0~142
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ea906d20517145895193a99666d5f2860a04360;p=thirdparty%2Fgit.git

0th batch for early fixes

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

diff --git a/Documentation/RelNotes/2.35.0.txt b/Documentation/RelNotes/2.35.0.txt
new file mode 100644
index 0000000000..3ebc797922
--- /dev/null
+++ b/Documentation/RelNotes/2.35.0.txt
@@ -0,0 +1,25 @@
+Git 2.35 Release Notes
+======================
+
+Updates since Git 2.34
+----------------------
+
+UI, Workflows & Features
+
+
+Performance, Internal Implementation, Development Support etc.
+
+
+
+Fixes since v2.34
+-----------------
+
+ * "git grep" looking in a blob that has non-UTF8 payload was
+   completely broken when linked with certain versions of PCREv2
+   library in the latest release.
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge edbd9f3715 ab/update-submitting-patches later to maint).
+
+ * "git pull" with any strategy when the other side is behind us
+   should succeed as it is a no-op, but doesn't.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 1ca3dfe943..8d2297c33b 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.34.0
+DEF_VER=v2.34.GIT
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index 6c94469548..c27c205001 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.34.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.35.0.txt
\ No newline at end of file