RelNotes 2.18: typofixes

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2018-06-11 09:15:34 -07:00
parent 3e5524907b
commit 6f333ff2fb

View File

@ -50,7 +50,7 @@ UI, Workflows & Features
have been replaced with a stub that errors out and tells the user have been replaced with a stub that errors out and tells the user
there are replacements. 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 contents to the specified encoding when checking out to the working
tree (and the other way around when checking in). tree (and the other way around when checking in).
@ -508,7 +508,7 @@ Fixes since v2.17
not committishes. not committishes.
(merge 0ed556d38f en/rev-parse-invalid-range later to maint). (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 repository's history did not have anything common between ours and
the upstream's, failed to execute. We need to fetch from them to the upstream's, failed to execute. We need to fetch from them to
continue even in such a case. continue even in such a case.