Git 2.20.5

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

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

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index de22ee7afad73d406a8b09a817f0199600575b0b..6785df167a32a2fb37fd3346ca2f7ccb4604d241 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.20.4
+DEF_VER=v2.20.5
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 0c3010e688fb348f36382db3cc00036fb7d69883..39862eebe9917075b140f90514b26f2699801d1d 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.20.4.txt
\ No newline at end of file
+Documentation/RelNotes/2.20.5.txt
\ No newline at end of file