# [PATCH] merge: don't document non-existing --compact-summary argument 2 messages from 2025-08-09 to 2025-08-10. Participants: René Scharfe, Junio C Hamano. Thread: https://gitlist.dev/t/63935 ## René Scharfe, 2025-08-09 10:00 Subject: [PATCH] merge: don't document non-existing --compact-summary argument Message-ID: <890631d1-4e3e-4ea5-8f58-371fadf2b1b3@web.de> URL: https://gitlist.dev/e/890631d1-4e3e-4ea5-8f58-371fadf2b1b3%40web.de ``` 3a54f5bd5d (merge/pull: add the "--compact-summary" option, 2025-06-12) added the option --compact-summary to both merge and pull. It takes no no argument, but for merge it got an argument help string. Remove it, since it is unnecessary. Signed-off-by: René Scharfe --- builtin/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/merge.c b/builtin/merge.c index dc4cb8fb14..ce880e6ccb 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -264,7 +264,7 @@ static struct option builtin_merge_options[] = { OPT_BOOL(0, "stat", &show_diffstat, N_("show a diffstat at the end of the merge")), OPT_BOOL(0, "summary", &show_diffstat, N_("(synonym to --stat)")), - OPT_CALLBACK_F(0, "compact-summary", &show_diffstat, N_("compact-summary"), + OPT_CALLBACK_F(0, "compact-summary", &show_diffstat, NULL, N_("show a compact-summary at the end of the merge"), PARSE_OPT_NOARG, option_parse_compact_summary), -- 2.50.1 ``` ## Junio C Hamano, 2025-08-10 00:07 Subject: Re: [PATCH] merge: don't document non-existing --compact-summary argument Message-ID: URL: https://gitlist.dev/e/xmqqa54859a3.fsf%40gitster.g In-Reply-To: <890631d1-4e3e-4ea5-8f58-371fadf2b1b3@web.de> ``` René Scharfe writes: > 3a54f5bd5d (merge/pull: add the "--compact-summary" option, 2025-06-12) > added the option --compact-summary to both merge and pull. It takes no > no argument, but for merge it got an argument help string. Remove it, > since it is unnecessary. Thanks. > > Signed-off-by: René Scharfe > --- > builtin/merge.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/merge.c b/builtin/merge.c > index dc4cb8fb14..ce880e6ccb 100644 > --- a/builtin/merge.c > +++ b/builtin/merge.c > @@ -264,7 +264,7 @@ static struct option builtin_merge_options[] = { > OPT_BOOL(0, "stat", &show_diffstat, > N_("show a diffstat at the end of the merge")), > OPT_BOOL(0, "summary", &show_diffstat, N_("(synonym to --stat)")), > - OPT_CALLBACK_F(0, "compact-summary", &show_diffstat, N_("compact-summary"), > + OPT_CALLBACK_F(0, "compact-summary", &show_diffstat, NULL, > N_("show a compact-summary at the end of the merge"), > PARSE_OPT_NOARG, > option_parse_compact_summary), ```