From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 12 Feb 2021 14:47:43 +0000 (+0100)
Subject: Git 2.18.5
X-Git-Tag: v2.18.5^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6eed462c8f973719799691c4f51b97f7970f2ac4;p=thirdparty%2Fgit.git

Git 2.18.5

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

diff --git a/Documentation/RelNotes/2.18.5.txt b/Documentation/RelNotes/2.18.5.txt
new file mode 100644
index 0000000000..dfb1de4ceb
--- /dev/null
+++ b/Documentation/RelNotes/2.18.5.txt
@@ -0,0 +1,6 @@
+Git v2.18.5 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6 to address
+the security issue CVE-2021-21300; see the release notes for that
+version for details.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4ed8c413e5..d522717b79 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.18.4
+DEF_VER=v2.18.5
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index 70822c3866..e66448298a 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.18.4.txt
\ No newline at end of file
+Documentation/RelNotes/2.18.5.txt
\ No newline at end of file