All of
 help / color / mirror / Atom feed
From: "" <>
To: git <>
Cc: "Junio C Hamano" <>
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: <> (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 */

             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 ` 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:

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

  git send-email \ \ \ \ \
    --subject='Re: Should "git apply"'\''s option "--3way" imply "--index" in option description?' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.