summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/2.36.6.txt7
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.36.6.txt b/Documentation/RelNotes/2.36.6.txt
new file mode 100644
index 0000000000..e1edebcc43
--- /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 4ac6f3ab03..8881b62378 100755
--- 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 8c469851cb..1c26012bbf 120000
--- 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