summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2021-02-12 14:49:17 (GMT)
committerJohannes Schindelin <johannes.schindelin@gmx.de>2021-02-12 14:49:17 (GMT)
commit8b1a5f33d3ed427b0a6eaee595537805db6bc38c (patch)
treec94f49bd2bf0dbec8f1c531f9b152bac4d9310ce
parent804963848e325ff6f4213e53aeda6ef831574e48 (diff)
downloadgit-2.20.5.zip
git-2.20.5.tar.gz
git-2.20.5.tar.bz2
Git 2.20.5v2.20.5
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
-rw-r--r--Documentation/RelNotes/2.20.5.txt6
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.20.5.txt b/Documentation/RelNotes/2.20.5.txt
new file mode 100644
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 de22ee7..6785df1 100755
--- 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 0c3010e..39862ee 120000
--- 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