summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-09-27 18:48:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-27 18:48:19 (GMT)
commit268fbcd172cdb306e8a3e7143cc16677c963d6cd (patch)
treed3ae3dd90f782fb8615b525d08f649358a263459
parent44f87dac99574a8073ffb1ba8b10bd4d3945f61b (diff)
downloadgit-268fbcd172cdb306e8a3e7143cc16677c963d6cd.zip
git-268fbcd172cdb306e8a3e7143cc16677c963d6cd.tar.gz
git-268fbcd172cdb306e8a3e7143cc16677c963d6cd.tar.bz2
Git 2.18.1v2.18.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.18.1.txt6
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.18.1.txt b/Documentation/RelNotes/2.18.1.txt
new file mode 100644
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 ed9d9e4..5998893 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 f6c58b3..392b0b3 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