git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Should "git apply"'s option "--3way" imply "--index" in option description?

From
Llilinchao@oschina.cn <lilinchao@oschina.cn>
Date
Jul 30, 2021, 08:32 UTC
Message-ID
<a9c2851af11011ebb8e40024e87935e7@oschina.cn>
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: Junio C Hamano
Message 1 of 2 in “Should "git apply"'s option "--3way" imply "--index" in option description?”
  1. lilinchao@oschina.cnJul 30, 2021
  2. Junio C HamanoJul 30, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.