From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 12 Feb 2021 14:49:36 +0000 (+0100)
Subject: Git 2.21.4
X-Git-Tag: v2.21.4^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c735d7470e75a7a14e9ac2d9ff8876a30615047a;p=thirdparty%2Fgit.git

Git 2.21.4

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

diff --git a/Documentation/RelNotes/2.21.4.txt b/Documentation/RelNotes/2.21.4.txt
new file mode 100644
index 0000000000..0089dd6702
--- /dev/null
+++ b/Documentation/RelNotes/2.21.4.txt
@@ -0,0 +1,6 @@
+Git v2.21.4 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6 and v2.20.5 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 372758ca62..9fc123a4ef 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.21.3
+DEF_VER=v2.21.4
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index 19f6240eec..607cb343c3 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.21.3.txt
\ No newline at end of file
+Documentation/RelNotes/2.21.4.txt
\ No newline at end of file