summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-06-11 09:15:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-11 09:15:34 -0700
commit6f333ff2fb28add6d54e9526b8dfdf47bc2b7a9a (patch)
treea8dbc3c0b4c6bf3d55d9bdbc891c0d81e29eccc4 /Documentation/RelNotes
parentGit 2.18-rc1 (diff)
downloadtgif-6f333ff2fb28add6d54e9526b8dfdf47bc2b7a9a.tar.xz
RelNotes 2.18: typofixes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes')
-rw-r--r--Documentation/RelNotes/2.18.0.txt4
1 files changed, 2 insertions, 2 deletions
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.