Git 2.18-rc1

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

Junio C Hamano committed Jun 4, 2018 at 21:41 UTC 3e5524907b43337e82a24afbc822078daf7a868f
2 files changed +13 -1
Documentation/RelNotes/2.18.0.txt
+12
@@ -508,6 +508,16 @@ Fixes since v2.17
508 not committishes.
509 (merge 0ed556d38f en/rev-parse-invalid-range later to maint).
510
511 + * "git pull -recurse-submodules --rebase", when the submodule
512 + repository's history did not have anything common between ours and
513 + the upstream's, failed to execute. We need to fetch from them to
514 + continue even in such a case.
515 + (merge 4d36f88be7 jt/submodule-pull-recurse-rebase later to maint).
516 +
517 + * "git remote update" can take both a single remote nickname and a
518 + nickname for remote groups, but only one of them was documented.
519 + (merge a97447a42a nd/remote-update-doc later to maint).
520 +
521 * Other minor doc, test and build updates and code cleanups.
522 (merge 248f66ed8e nd/trace-with-env later to maint).
523 (merge 14ced5562c ys/bisect-object-id-missing-conversion-fix later to maint).
@@ -541,3 +551,5 @@ Fixes since v2.17
551 (merge 17b8a2d6cd jk/config-blob-sans-repo later to maint).
552 (merge 590551ca2c rd/tag-doc-lightweight later to maint).
553 (merge 44f560fc16 rd/init-typo later to maint).
554 + (merge f156a0934a rd/p4-doc-markup-env later to maint).
555 + (merge 2a00502b14 tg/doc-sec-list later to maint).
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v2.18.0-rc0
4 +DEF_VER=v2.18.0-rc1
5
6 LF='
7 '