From: Junio C Hamano Date: Mon, 11 Jun 2018 16:15:34 +0000 (-0700) Subject: RelNotes 2.18: typofixes X-Git-Tag: v2.18.0-rc2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f333ff2fb28add6d54e9526b8dfdf47bc2b7a9a;p=thirdparty%2Fgit.git RelNotes 2.18: typofixes Signed-off-by: Junio C Hamano --- diff --git a/Documentation/RelNotes/2.18.0.txt b/Documentation/RelNotes/2.18.0.txt index 8d0ee5c426..ed80e5485b 100644 --- a/Documentation/RelNotes/2.18.0.txt +++ b/Documentation/RelNotes/2.18.0.txt @@ -50,7 +50,7 @@ UI, Workflows & Features have been replaced with a stub that errors out and tells the user there are replacements. - * The new "checkout-encoding" attribute can ask Git to convert the + * The new "working-tree-encoding" attribute can ask Git to convert the contents to the specified encoding when checking out to the working tree (and the other way around when checking in). @@ -508,7 +508,7 @@ Fixes since v2.17 not committishes. (merge 0ed556d38f en/rev-parse-invalid-range later to maint). - * "git pull -recurse-submodules --rebase", when the submodule + * "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.