From: Philippe Blain Date: Wed, 12 Aug 2020 23:52:00 +0000 (+0000) Subject: fetch, pull doc: correct description of '--set-upstream' X-Git-Tag: v2.29.0-rc0~146^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=847b37271ed607d459fbe0f60a6dea937787390a;p=thirdparty%2Fgit.git fetch, pull doc: correct description of '--set-upstream' The '--set-upstream' option to `git fetch` (which is also accepted by `git pull` and passed through to the underlying `git fetch`) allows setting the upstream configuration for the current branch. This was added in 24bc1a1292 (pull, fetch: add --set-upstream option, 2019-08-19). However, the documentation for that option describes its action as 'If the remote is fetched successfully, pull and add upstream (tracking) reference [...]', which is wrong because this option does not cause neither `git fetch` nor `git pull` to pull: `git fetch` does not pull and `git pull` always pulls. Fix the description of that option. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano --- 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..merge` and `branch..remote` in