summaryrefslogtreecommitdiffstats
path: root/git-fetch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-08-08 14:46:11 -0700
committerJunio C Hamano <gitster@pobox.com>2019-08-08 14:46:11 -0700
commit2aba1015961dc17e61159c30c374af72379615d0 (patch)
treed2bb5d27bcc50936a361b7899480c2cb555d6eac /git-fetch.txt
parent98e725549e9be991ecd49152b8b75f97405054cf (diff)
downloadgit-htmldocs-2aba1015961dc17e61159c30c374af72379615d0.tar.gz
Autogenerated HTML docs for v2.23.0-rc1-10-gc2a8c3
Diffstat (limited to 'git-fetch.txt')
-rw-r--r--git-fetch.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-fetch.txt b/git-fetch.txt
index 266d63cf1..5b1909fdf 100644
--- a/git-fetch.txt
+++ b/git-fetch.txt
@@ -262,7 +262,7 @@ This updates (or creates, as necessary) branches `pu` and `tmp` in
the local repository by fetching from the branches (respectively)
`pu` and `maint` from the remote repository.
+
-The `pu` branch will be updated even if it is does not fast-forward,
+The `pu` branch will be updated even if it does not fast-forward,
because it is prefixed with a plus sign; `tmp` will not be.
* Peek at a remote's branch, without configuring the remote in your local
@@ -285,7 +285,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.