@matheusbsbs / matheus-bagliano / commits / 847b37271e
Fork 0

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>

Philippe Blain committed Aug 12, 2020 at 23:52 UTC 847b37271ed607d459fbe0f60a6dea937787390a
1 file changed +1 -1
Documentation/fetch-options.txt
+1 -1
@@ -186,7 +186,7 @@ ifndef::git-pull[]
186 endif::git-pull[]
187
188 --set-upstream::
189 - If the remote is fetched successfully, pull and add upstream
189 + If the remote is fetched successfully, add upstream
190 (tracking) reference, used by argument-less
191 linkgit:git-pull[1] and other commands. For more information,
192 see `branch.<name>.merge` and `branch.<name>.remote` in