* Should "git apply"'s option "--3way" imply "--index" in option description?
@ 2021-07-30 8:32 lilinchao
2021-07-30 14:34 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: lilinchao @ 2021-07-30 8:32 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
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 */
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: Should "git apply"'s option "--3way" imply "--index" in option description?
2021-07-30 8:32 Should "git apply"'s option "--3way" imply "--index" in option description? lilinchao
@ 2021-07-30 14:34 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2021-07-30 14:34 UTC (permalink / raw)
To: lilinchao; +Cc: git
"lilinchao@oschina.cn" <lilinchao@oschina.cn> writes:
> 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 */
It is not incorrect per-se, but because "--3way" implies "--index"
only when "--cached" is not in effect, it may do more harm than it
helps to mention only just the "--index" half of the story.
If we were to touch that line, I'd just chop off "if that fails" at
the end---the phrase "fall back" already tells readers that it happens
only when the non-fallback action does not work.
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-30 14:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-30 8:32 Should "git apply"'s option "--3way" imply "--index" in option description? lilinchao
2021-07-30 14:34 ` Junio C Hamano
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).