X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Documentation%2Ffetch-options.txt;h=99df1f3d4e3773bf78c4c3c128f91b33fc084d2f;hb=0253e126a271f10dc1f1fc630193a4026ec8a7ee;hp=3c9b4f9e09515d99d32a3d6dfa6603ef3a6f23b6;hpb=ff66981f4593aec0f3b3eeace0eacb7dbe44fd8c;p=thirdparty%2Fgit.git

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