summaryrefslogtreecommitdiff
path: root/Documentation/fetch-options.txt
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2020-03-28 14:48:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-29 01:13:09 (GMT)
commitf05558f3e290fcc69f8ba67310b2c7dd83ebe938 (patch)
tree0c8b40b2469e962b35da046db65f98eecb8595f6 /Documentation/fetch-options.txt
parent9c688735f68ef76237708db66b2078bbe78d8f09 (diff)
downloadgit-f05558f3e290fcc69f8ba67310b2c7dd83ebe938.zip
git-f05558f3e290fcc69f8ba67310b2c7dd83ebe938.tar.gz
git-f05558f3e290fcc69f8ba67310b2c7dd83ebe938.tar.bz2
pull: remove --update-head-ok from documentation
'git pull' implicitly passes --update-head-ok to 'git fetch', but doesn't itself accept that option from users. That makes sense, as it wouldn't work without the possibility to update HEAD. Remove the option from the command's documentation to match its actual behavior. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/fetch-options.txt')
-rw-r--r--Documentation/fetch-options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 00d03ec..05709f6 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -204,7 +204,6 @@ ifndef::git-pull[]
recursion (such as settings in linkgit:gitmodules[5] and
linkgit:git-config[1]) override this option, as does
specifying --[no-]recurse-submodules directly.
-endif::git-pull[]
-u::
--update-head-ok::
@@ -214,6 +213,7 @@ endif::git-pull[]
to communicate with 'git fetch', and unless you are
implementing your own Porcelain you are not supposed to
use it.
+endif::git-pull[]
--upload-pack <upload-pack>::
When given, and the repository to fetch from is handled