aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-08-19 16:14:51 -0700
committerJunio C Hamano <gitster@pobox.com>2020-08-19 16:14:51 -0700
commitee356a8818b1dd164ffd1936afbafba52608536b (patch)
treecff81c3c2f962529a5cf113011ba1db8816cb6a4
parentMerge branch 'pb/userdiff-fortran-update' (diff)
parentfetch, pull doc: correct description of '--set-upstream' (diff)
downloadgit-ee356a8818b1dd164ffd1936afbafba52608536b.tar.gz
git-ee356a8818b1dd164ffd1936afbafba52608536b.zip
Merge branch 'pb/set-url-docfix'
Doc fix. * pb/set-url-docfix: fetch, pull doc: correct description of '--set-upstream'
-rw-r--r--Documentation/fetch-options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 6e2a160a47..ff70625694 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -186,7 +186,7 @@ ifndef::git-pull[]
endif::git-pull[]
--set-upstream::
- If the remote is fetched successfully, pull and add upstream
+ If the remote is fetched successfully, add upstream
(tracking) reference, used by argument-less
linkgit:git-pull[1] and other commands. For more information,
see `branch.<name>.merge` and `branch.<name>.remote` in