Git 2.15.4v2.15.4

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

3 files changed, 13 insertions, 2 deletions

diff --git a/Documentation/RelNotes/2.15.4.txt b/Documentation/RelNotes/2.15.4.txt
new file mode 100644
index 0000000000..dc241cba34
--- /dev/null
+++ b/Documentation/RelNotes/2.15.4.txt
@@ -0,0 +1,11 @@
+Git v2.15.4 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6 to address
+the security issues CVE-2019-1348, CVE-2019-1349, CVE-2019-1350,
+CVE-2019-1351, CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, and
+CVE-2019-1387; see the release notes for that version for details.
+
+In conjunction with a vulnerability that was fixed in v2.20.2,
+`.gitmodules` is no longer allowed to contain entries of the form
+`submodule.<name>.update=!command`.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4a63ce35ad..6fe1c9dcc7 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.15.3
+DEF_VER=v2.15.4
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index e7fe59f5d0..03f405050e 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.15.3.txt
\ No newline at end of file
+Documentation/RelNotes/2.15.4.txt
\ No newline at end of file