Git 2.18-rc2

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.18.0.txt b/Documentation/RelNotes/2.18.0.txt
index 449e49e0eb4ebc1560be3989b75957fed3fa8cec..7c59bd92fbd99bd03f3261c67014b713b0b988c3 100644 (file)
--- a/Documentation/RelNotes/2.18.0.txt
+++ b/Documentation/RelNotes/2.18.0.txt
@@ -518,6 +518,11 @@ Fixes since v2.17
    nickname for remote groups, but only one of them was documented.
    (merge a97447a42a nd/remote-update-doc later to maint).
 
+ * "index-pack --strict" has been taught to make sure that it runs the
+   final object integrity checks after making the freshly indexed
+   packfile available to itself.
+   (merge 3737746120 jk/index-pack-maint later to maint).
+
  * Other minor doc, test and build updates and code cleanups.
    (merge 248f66ed8e nd/trace-with-env later to maint).
    (merge 14ced5562c ys/bisect-object-id-missing-conversion-fix later to maint).
@@ -553,3 +558,4 @@ Fixes since v2.17
    (merge 44f560fc16 rd/init-typo later to maint).
    (merge f156a0934a rd/p4-doc-markup-env later to maint).
    (merge 2a00502b14 tg/doc-sec-list later to maint).
+   (merge 47cc91310a jk/submodule-fsck-loose-fixup later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 1971bf34c3bcf45399ec15e496cb3072004d6324..49fc15e1c14ccaee280f9da46c011d976ac33405 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.18.0-rc1
+DEF_VER=v2.18.0-rc2
 
 LF='
 '