diff options
| author |  René Scharfe <l.s.r@web.de> | 2020-03-28 15:48:33 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-03-28 18:13:09 -0700 |
| commit | f05558f3e290fcc69f8ba67310b2c7dd83ebe938 (patch) | |
| tree | 0c8b40b2469e962b35da046db65f98eecb8595f6 | |
| parent | pull: document more passthru options (diff) | |
| download | tgif-f05558f3e290fcc69f8ba67310b2c7dd83ebe938.tar.xz | |
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>
| -rw-r--r-- | Documentation/fetch-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 00d03ec8c3..05709f67a1 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 |