{"thread":{"id":"54032","subject":"[PATCH] fetch, pull doc: correct description of '--set-upstream'","startedAt":"2020-08-12T23:52:05Z","lastAt":"2020-08-13T18:21:03Z","messageCount":2,"participants":["Philippe Blain via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"403520","messageId":"pull.701.git.1597276320563.gitgitgadget@gmail.com","threadId":"54032","inReplyTo":null,"subject":"[PATCH] fetch, pull doc: correct description of '--set-upstream'","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-08-12T23:52:00Z","receivedAt":"2020-08-12T23:52:05Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain <levraiphilippeblain@gmail.com>\n\nThe '--set-upstream' option to `git fetch` (which is also accepted by\n`git pull` and passed through to the underlying `git fetch`) allows\nsetting the upstream configuration for the current branch. This was\nadded in 24bc1a1292 (pull, fetch: add --set-upstream option,\n2019-08-19).\n\nHowever, the documentation for that option describes its action as 'If\nthe remote is fetched successfully, pull and add upstream (tracking)\nreference [...]', which is wrong because this option does not cause\nneither `git fetch` nor `git pull` to pull: `git fetch` does not pull\nand `git pull` always pulls.\n\nFix the description of that option.\n\nSigned-off-by: Philippe Blain <levraiphilippeblain@gmail.com>\n---\n    fetch, pull doc: correct description of '--set-upstream'\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-701%2Fphil-blain%2Ffetch-set-upstream-doc-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-701/phil-blain/fetch-set-upstream-doc-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/701\n\n Documentation/fetch-options.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt\nindex 6e2a160a47..ff70625694 100644\n--- a/Documentation/fetch-options.txt\n+++ b/Documentation/fetch-options.txt\n@@ -186,7 +186,7 @@ ifndef::git-pull[]\n endif::git-pull[]\n \n --set-upstream::\n-\tIf the remote is fetched successfully, pull and add upstream\n+\tIf the remote is fetched successfully, add upstream\n \t(tracking) reference, used by argument-less\n \tlinkgit:git-pull[1] and other commands. For more information,\n \tsee `branch.<name>.merge` and `branch.<name>.remote` in\n\nbase-commit: 7814e8a05a59c0cf5fb186661d1551c75d1299b5\n-- \ngitgitgadget\n"},{"id":"403584","messageId":"xmqqimdm2yr9.fsf@gitster.c.googlers.com","threadId":"54032","inReplyTo":"pull.701.git.1597276320563.gitgitgadget@gmail.com","subject":"Re: [PATCH] fetch, pull doc: correct description of '--set-upstream'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-08-13T18:20:58Z","receivedAt":"2020-08-13T18:21:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Philippe Blain via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> --- a/Documentation/fetch-options.txt\n> +++ b/Documentation/fetch-options.txt\n> @@ -186,7 +186,7 @@ ifndef::git-pull[]\n>  endif::git-pull[]\n>  \n>  --set-upstream::\n> -\tIf the remote is fetched successfully, pull and add upstream\n> +\tIf the remote is fetched successfully, add upstream\n>  \t(tracking) reference, used by argument-less\n\nMakes sense.  Will queue.  Thanks.\n\n>  \tlinkgit:git-pull[1] and other commands. For more information,\n>  \tsee `branch.<name>.merge` and `branch.<name>.remote` in\n>\n> base-commit: 7814e8a05a59c0cf5fb186661d1551c75d1299b5\n"}]}