From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 4 Dec 2019 21:22:52 +0000 (+0100)
Subject: Git 2.18.2
X-Git-Tag: v2.24.1~1^2~1^2~1^2~3^2~3^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9877106b01cbd346b862cc8cd2c52e496dd40ed5;p=thirdparty%2Fgit.git

Git 2.18.2

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

diff --git a/Documentation/RelNotes/2.18.2.txt b/Documentation/RelNotes/2.18.2.txt
new file mode 100644
index 0000000000..98b168aade
--- /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 5998893dd7..5ae6419eb4 100755
--- 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 392b0b3115..1b5f706c0f 120000
--- 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