Git 2.36.6

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

diff --git a/Documentation/RelNotes/2.36.6.txt b/Documentation/RelNotes/2.36.6.txt
new file mode 100644 (file)
index 0000000..e1edebc
--- /dev/null
+++ b/Documentation/RelNotes/2.36.6.txt
@@ -0,0 +1,7 @@
+Git v2.36.6 Release Notes
+=========================
+
+This release merges the fixes that appear in v2.30.9, v2.31.8,
+v2.32.7, v2.33.8, v2.34.8 and v2.35.8 to address the security issues
+CVE-2023-25652, CVS-2023-25815, and CVE-2023-29007; see the release
+notes for these versions for details.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4ac6f3ab034d56d665f07a21d8859a5c6c7b5c34..8881b623783a468e4f5657410318faf841f35f0d 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.36.5
+DEF_VER=v2.36.6
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 8c469851cbdbc2423112701a37f2b466b64b119d..1c26012bbfe3fc87beaa28d02a9d748d65679038 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.36.5.txt
\ No newline at end of file
+Documentation/RelNotes/2.36.6.txt
\ No newline at end of file