From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun, 19 Apr 2020 23:24:14 +0000 (-0700)
Subject: Git 2.18.4
X-Git-Tag: v2.18.4^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba6f0905fdb9e65c1ac5fbc79c9a4ef0b59b3e68;p=thirdparty%2Fgit.git

Git 2.18.4

This merges up the security fix from v2.17.5.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---

ba6f0905fdb9e65c1ac5fbc79c9a4ef0b59b3e68
diff --cc Documentation/RelNotes/2.18.4.txt
index 0000000000,0000000000..e8ef858a00
new file mode 100644
--- /dev/null
+++ b/Documentation/RelNotes/2.18.4.txt
@@@ -1,0 -1,0 +1,5 @@@
++Git v2.18.4 Release Notes
++=========================
++
++This release merges the security fix that appears in v2.17.5; see
++the release notes for that version for details.
diff --cc GIT-VERSION-GEN
index fd9e5b87b2,85d9db5600..4ed8c413e5
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
- DEF_VER=v2.18.3
 -DEF_VER=v2.17.5
++DEF_VER=v2.18.4
  
  LF='
  '
diff --cc RelNotes
index 1811ee10b3,07012e884f..70822c3866
--- a/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes/2.18.3.txt
 -Documentation/RelNotes/2.17.5.txt
++Documentation/RelNotes/2.18.4.txt