Git 2.18.2

Signed-off-by: Johannes Schindelin <redacted>

diff --git a/Documentation/RelNotes/2.18.2.txt b/Documentation/RelNotes/2.18.2.txt
new file mode 100644 (file)
index 0000000..98b168a
--- /dev/null
+++ b/Documentation/RelNotes/2.18.2.txt
@@ -0,0 +1,8 @@
+Git v2.18.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4
+and in v2.17.3, addressing 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 those versions for details.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 5998893dd7005f5ce63946ae5ec53bb18a20c3e9..5ae6419eb41644f8427cfb0870a47cf825012198 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.18.1
+DEF_VER=v2.18.2
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 392b0b3115c633b169cb003430d7f2ac373bf4b7..1b5f706c0ffe28042da045814654d26658dc4736 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.18.1.txt
\ No newline at end of file
+Documentation/RelNotes/2.18.2.txt
\ No newline at end of file