From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Sep 2018 18:48:19 +0000 (-0700)
Subject: Git 2.18.1
X-Git-Tag: v2.18.1^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=268fbcd172cdb306e8a3e7143cc16677c963d6cd;p=thirdparty%2Fgit.git

Git 2.18.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/RelNotes/2.18.1.txt b/Documentation/RelNotes/2.18.1.txt
new file mode 100644
index 0000000000..2098cdd776
--- /dev/null
+++ b/Documentation/RelNotes/2.18.1.txt
@@ -0,0 +1,6 @@
+Git v2.18.1 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.5 and in
+v2.17.2 to address the recently reported CVE-2018-17456; see the
+release notes for those versions for details.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index ed9d9e43a9..5998893dd7 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.18.0
+DEF_VER=v2.18.1
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index f6c58b347f..392b0b3115 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.18.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.18.1.txt
\ No newline at end of file