Git 2.18.5

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

diff --git a/Documentation/RelNotes/2.18.5.txt b/Documentation/RelNotes/2.18.5.txt
new file mode 100644 (file)
index 0000000..dfb1de4
--- /dev/null
+++ b/Documentation/RelNotes/2.18.5.txt
@@ -0,0 +1,6 @@
+Git v2.18.5 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6 to address
+the security issue CVE-2021-21300; see the release notes for that
+version for details.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4ed8c413e5f5a750e5c25f729ec8f3294009fccc..d522717b795789c2396cba33c1bcab53e505afbf 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.18.4
+DEF_VER=v2.18.5
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 70822c3866c85c735ba657b50f749536ef0986c9..e66448298a29037a6d95bca2ff33916b01a854e0 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.18.4.txt
\ No newline at end of file
+Documentation/RelNotes/2.18.5.txt
\ No newline at end of file