summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/2.36.5.txt7
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.36.5.txt b/Documentation/RelNotes/2.36.5.txt
new file mode 100644
index 0000000..8a098c7
--- /dev/null
+++ b/Documentation/RelNotes/2.36.5.txt
@@ -0,0 +1,7 @@
+Git v2.36.5 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.8, v2.31.7,
+v2.32.6, v2.33.7, v2.34.7 and v2.35.7 to address the security
+issues CVE-2023-22490 and CVE-2023-23946; see the release notes
+for these versions for details.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 6f52323..4ac6f3a 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.36.4
+DEF_VER=v2.36.5
LF='
'
diff --git a/RelNotes b/RelNotes
index 800f4e1..8c46985 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.36.4.txt \ No newline at end of file
+Documentation/RelNotes/2.36.5.txt \ No newline at end of file