summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorMark Rushakoff <mark.rushakoff@gmail.com>2019-08-03 05:33:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-08-05 17:05:24 (GMT)
commit6d16922798bbb87ddbc1ff1d23ba8ea65f4f6d3b (patch)
tree368d00c40a9d4aca1d30d7d8c23985030ceb34d9 /Documentation/git-pull.txt
parent4d8ec15c66f32e29e4dfcdf64d0826c425d8ad7d (diff)
downloadgit-6d16922798bbb87ddbc1ff1d23ba8ea65f4f6d3b.zip
git-6d16922798bbb87ddbc1ff1d23ba8ea65f4f6d3b.tar.gz
git-6d16922798bbb87ddbc1ff1d23ba8ea65f4f6d3b.tar.bz2
doc: typo: s/can not/cannot/ and s/is does/does/
"Can not" suggests one has the option to not do something, whereas "cannot" more strongly suggests something is disallowed or impossible. Noticed "can not", mistakenly used instead of "cannot" in git help glossary, then ran git grep 'can not' and found many other instances. Only files in the Documentation folder were modified. 'Can not' also occurs in some source code comments and some test assertion messages, and there is an error message and translation "can not move directory into itself" which I may fix and submit separately from the documentation change. Also noticed and fixed "is does" in git help fetch, but there are no other occurrences of that typo according to git grep. Signed-off-by: Mark Rushakoff <mark.rushakoff@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index a5e9501..dfb901f 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -249,7 +249,7 @@ BUGS
----
Using --recurse-submodules can only fetch new commits in already checked
out submodules right now. When e.g. upstream added a new submodule in the
-just fetched commits of the superproject the submodule itself can not be
+just fetched commits of the superproject the submodule itself cannot be
fetched, making it impossible to check out that submodule later without
having to do a fetch again. This is expected to be fixed in a future Git
version.