git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "René Scharfe" <l.s.r@web.de>
To: git@vger.kernel.org
Cc: 天几 <muzimuzhi@gmail.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
	"Dongcan Jiang" <dongcan.jiang@gmail.com>,
	"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH 2/1] pull: remove --update-head-ok from documentation
Date: Sat, 28 Mar 2020 15:48:33 +0100	[thread overview]
Message-ID: <c94f8c43-625c-8e99-fa04-aafb0c7cdd78@web.de> (raw)
In-Reply-To: <a406c273-9a2c-72ed-c5e3-4c19848f0f94@web.de>

'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>
---
 Documentation/fetch-options.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
--
2.26.0

  reply	other threads:[~2020-03-28 14:48 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-08 19:17 Documented option "--deepen" is unknown to git-pull 天几
2020-03-09 21:51 ` René Scharfe
2020-03-28 14:48   ` René Scharfe [this message]
2020-03-31 21:48     ` [PATCH 2/1] pull: remove --update-head-ok from documentation Taylor Blau
2020-03-31 23:21       ` René Scharfe
2020-03-28 14:48   ` [PATCH 3/1] pull: pass documented fetch options on René Scharfe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c94f8c43-625c-8e99-fa04-aafb0c7cdd78@web.de \
    --to=l.s.r@web.de \
    --cc=dongcan.jiang@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=muzimuzhi@gmail.com \
    --cc=pclouds@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).