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>
René Scharfe committed
Mar 28, 2020 at 15:48 UTC
f05558f3e290fcc69f8ba67310b2c7dd83ebe938
1 file changed
+1
-1
Documentation/fetch-options.txt
+1
-1
@@ -204,7 +204,6 @@ ifndef::git-pull[]
204
recursion (such as settings in linkgit:gitmodules[5] and
205
linkgit:git-config[1]) override this option, as does
206
specifying --[no-]recurse-submodules directly.
207
-endif::git-pull[]
207
208
-u::
209
--update-head-ok::
@@ -214,6 +213,7 @@ endif::git-pull[]
213
to communicate with 'git fetch', and unless you are
214
implementing your own Porcelain you are not supposed to
215
use it.
216
+endif::git-pull[]
217
218
--upload-pack <upload-pack>::
219
When given, and the repository to fetch from is handled