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 (file)
index 0000000..2098cdd
--- /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 ed9d9e43a980e9f368bd8740b0b77183826eb0ea..5998893dd7005f5ce63946ae5ec53bb18a20c3e9 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v2.18.0
+DEF_VER=v2.18.1

 
 LF='
 '
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index f6c58b347fd8338482625ea11ec1802baa6ea068..392b0b3115c633b169cb003430d7f2ac373bf4b7 120000 (symlink)
--- 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