From: "lilinchao@oschina.cn" <lilinchao@oschina.cn>
To: git <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>
Subject: Should "git apply"'s option "--3way" imply "--index" in option description?
Date: Fri, 30 Jul 2021 16:32:21 +0800 [thread overview]
Message-ID: <a9c2851af11011ebb8e40024e87935e7@oschina.cn> (raw)
like this:
diff --git a/apply.c b/apply.c
index 44bc31d6eb..0b353af96c 100644
--- a/apply.c
+++ b/apply.c
@@ -5024,7 +5024,7 @@ int apply_parse_options(int argc, const char **argv,
OPT_BOOL(0, "apply", force_apply,
N_("also apply the patch (use with --stat/--summary/--check)")),
OPT_BOOL('3', "3way", &state->threeway,
- N_( "attempt three-way merge, fall back on normal patch if that fails")),
+ N_( "attempt three-way merge, fall back on normal patch if that fails(implies --index)")),
OPT_FILENAME(0, "build-fake-ancestor", &state->fake_ancestor,
N_("build a temporary index based on embedded index information")),
/* Think twice before adding "--nul" synonym to this */
next reply other threads:[~2021-07-30 8:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-30 8:32 lilinchao [this message]
2021-07-30 14:34 ` Should "git apply"'s option "--3way" imply "--index" in option description? Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a9c2851af11011ebb8e40024e87935e7@oschina.cn \
--to=lilinchao@oschina.cn \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).