summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2021-02-12 14:49:41 (GMT)
committerJohannes Schindelin <johannes.schindelin@gmx.de>2021-02-12 14:49:41 (GMT)
commitc753e2a7a8e81c646611e808ce3b7a68f6e90add (patch)
treee886dc6d736cb3acb18810f79a06e1731d868326
parentbcf08f33d840b8a6bef347aea3ac2359874c888a (diff)
downloadgit-c753e2a7a8e81c646611e808ce3b7a68f6e90add.zip
git-c753e2a7a8e81c646611e808ce3b7a68f6e90add.tar.gz
git-c753e2a7a8e81c646611e808ce3b7a68f6e90add.tar.bz2
Git 2.22.5v2.22.5
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
-rw-r--r--Documentation/RelNotes/2.22.5.txt7
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.22.5.txt b/Documentation/RelNotes/2.22.5.txt
new file mode 100644
index 0000000..6b280d9
--- /dev/null
+++ b/Documentation/RelNotes/2.22.5.txt
@@ -0,0 +1,7 @@
+Git v2.22.5 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6,
+v2.18.5, v2.19.6, v2.20.5 and v2.21.4 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 8acd429..ad43a47 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.22.4
+DEF_VER=v2.22.5
LF='
'
diff --git a/RelNotes b/RelNotes
index 09c7750..55ac147 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.22.4.txt \ No newline at end of file
+Documentation/RelNotes/2.22.5.txt \ No newline at end of file