Git 2.36-rc2

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

diff --git a/Documentation/RelNotes/2.36.0.txt b/Documentation/RelNotes/2.36.0.txt
index 8da5b2e1e7e650e27fac57b31565580caf175518..d61ade21e2be92884c8b9541800ae042e1ff3f88 100644 (file)
--- a/Documentation/RelNotes/2.36.0.txt
+++ b/Documentation/RelNotes/2.36.0.txt
@@ -397,6 +397,8 @@ Fixes since v2.35
    entry it moved.
    (merge b7f9130a06 vd/mv-refresh-stat later to maint).
 
+ * Fix for CVE-2022-24765 has been merged up from 2.35.2 and others.
+
  * Other code cleanup, docfix, build fix, etc.
    (merge cfc5cf428b jc/find-header later to maint).
    (merge 40e7cfdd46 jh/p4-fix-use-of-process-error-exception later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 1c5f6451673f2cbd52b4e6c5252f8d780a05400f..9252e0430d46119011c5e26520a7179a9222d787 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.36.0-rc1
+DEF_VER=v2.36.0-rc2
 
 LF='
 '