kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Philippe Blain 2020-08-12 23:52:00 +00:00 committed by Junio C Hamano
parent 47ae905ffb
commit 847b37271e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/fetch-options.txt
View File

@ -186,7 +186,7 @@ ifndef::git-pull[]
endif::git-pull[] endif::git-pull[]


--set-upstream:: --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 (tracking) reference, used by argument-less
linkgit:git-pull[1] and other commands. For more information, linkgit:git-pull[1] and other commands. For more information,
see `branch.<name>.merge` and `branch.<name>.remote` in see `branch.<name>.merge` and `branch.<name>.remote` in