Git 2.22.5

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

diff --git a/Documentation/RelNotes/2.22.5.txt b/Documentation/RelNotes/2.22.5.txt
new file mode 100644 (file)
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 8acd429ebd8cc09b0e4eb0173c1eb1a0a6077668..ad43a47e78a772119d504688a8ab23ac0b87a36a 100755 (executable)
--- 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 09c7750f25167aa029a87e614ddc0a00776c845b..55ac1476de239b2b60a1264d8f4fc6a842fdd465 120000 (symlink)
--- 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