Skip to content

Commit 3e55249

Browse files
committed
Git 2.18-rc1
Signed-off-by: Junio C Hamano <[email protected]>
1 parent e66e8f9 commit 3e55249

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

Documentation/RelNotes/2.18.0.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,16 @@ Fixes since v2.17
508508
not committishes.
509509
(merge 0ed556d38f en/rev-parse-invalid-range later to maint).
510510

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+
511521
* Other minor doc, test and build updates and code cleanups.
512522
(merge 248f66ed8e nd/trace-with-env later to maint).
513523
(merge 14ced5562c ys/bisect-object-id-missing-conversion-fix later to maint).
@@ -541,3 +551,5 @@ Fixes since v2.17
541551
(merge 17b8a2d6cd jk/config-blob-sans-repo later to maint).
542552
(merge 590551ca2c rd/tag-doc-lightweight later to maint).
543553
(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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
GVF=GIT-VERSION-FILE
4-
DEF_VER=v2.18.0-rc0
4+
DEF_VER=v2.18.0-rc1
55

66
LF='
77
'

0 commit comments

Comments
 (0)