aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-09-09 12:26:37 -0700
committerJunio C Hamano <gitster@pobox.com>2019-09-09 12:26:37 -0700
commit94373946614f864bdcd5e0cb72e360edbed1c77f (patch)
treef76e29cf07e726727c94fadfd9d3af5a63716bdd /Documentation
parentaf2b8faf49ff81491872137024a464cdb7a72b10 (diff)
parent24bc1a129260eaf713c87f087f28883fe18891b5 (diff)
downloadgit-94373946614f864bdcd5e0cb72e360edbed1c77f.tar.xz
Merge branch 'cb/fetch-set-upstream'
"git fetch" learned "--set-upstream" option to help those who first clone from their private fork they intend to push to, add the true upstream via "git remote add" and then "git fetch" from it. * cb/fetch-set-upstream: pull, fetch: add --set-upstream option
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/fetch-options.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 3c9b4f9e09..99df1f3d4e 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -169,6 +169,13 @@ ifndef::git-pull[]
Disable recursive fetching of submodules (this has the same effect as
using the `--recurse-submodules=no` option).
+--set-upstream::
+ If the remote is fetched successfully, pull and 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
+ linkgit:git-config[1].
+
--submodule-prefix=<path>::
Prepend <path> to paths printed in informative messages
such as "Fetching submodule foo". This option is used