summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-05-22 14:15:59 +0900
committerJunio C Hamano <gitster@pobox.com>2018-05-22 14:15:59 +0900
commitd33c87517a85f544159b2efa406136dde18a5b9f (patch)
treef28f7998faefd4b51d25d717428d5a0e75dcbea2
parent9e0f06d55df5855178ff41342937943604f6e97c (diff)
downloadgit-d33c87517a85f544159b2efa406136dde18a5b9f.tar.gz
Git 2.15.2v2.15.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.15.2.txt3
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.15.2.txt b/Documentation/RelNotes/2.15.2.txt
index 9f7e28f8a2..b480e56b68 100644
--- a/Documentation/RelNotes/2.15.2.txt
+++ b/Documentation/RelNotes/2.15.2.txt
@@ -43,5 +43,8 @@ Fixes since v2.15.1
* Clarify and enhance documentation for "merge-base --fork-point", as
it was clear what it computed but not why/what for.
+ * This release also contains the fixes made in the v2.13.7 version of
+ Git. See its release notes for details.
+
Also contains various documentation updates and code clean-ups.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 879178c550..824649f698 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.15.1
+DEF_VER=v2.15.2
LF='
'