summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-04 12:41:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-04 12:41:41 (GMT)
commit3e5524907b43337e82a24afbc822078daf7a868f (patch)
tree4ec41fbdfd4e9569fceb3e25d4c1945f1944af0e
parente66e8f9be8af90671b85a758b62610bd1162de2d (diff)
downloadgit-2.18.0-rc1.zip
git-2.18.0-rc1.tar.gz
git-2.18.0-rc1.tar.bz2
Git 2.18-rc1v2.18.0-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.18.0.txt12
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 13 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.18.0.txt b/Documentation/RelNotes/2.18.0.txt
index 326ee9e..8d0ee5c 100644
--- a/Documentation/RelNotes/2.18.0.txt
+++ b/Documentation/RelNotes/2.18.0.txt
@@ -508,6 +508,16 @@ Fixes since v2.17
not committishes.
(merge 0ed556d38f en/rev-parse-invalid-range later to maint).
+ * "git pull -recurse-submodules --rebase", when the submodule
+ repository's history did not have anything common between ours and
+ the upstream's, failed to execute. We need to fetch from them to
+ continue even in such a case.
+ (merge 4d36f88be7 jt/submodule-pull-recurse-rebase later to maint).
+
+ * "git remote update" can take both a single remote nickname and a
+ nickname for remote groups, but only one of them was documented.
+ (merge a97447a42a nd/remote-update-doc 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).
@@ -541,3 +551,5 @@ Fixes since v2.17
(merge 17b8a2d6cd jk/config-blob-sans-repo later to maint).
(merge 590551ca2c rd/tag-doc-lightweight later to maint).
(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).
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index bdd758e..1971bf3 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.18.0-rc0
+DEF_VER=v2.18.0-rc1
LF='
'