* [PATCH] merge: don't document non-existing --compact-summary argument
@ 2025-08-09 10:00 René Scharfe
2025-08-10 0:07 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: René Scharfe @ 2025-08-09 10:00 UTC (permalink / raw)
To: Git List; +Cc: Junio C Hamano
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 <l.s.r@web.de>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] merge: don't document non-existing --compact-summary argument
2025-08-09 10:00 [PATCH] merge: don't document non-existing --compact-summary argument René Scharfe
@ 2025-08-10 0:07 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2025-08-10 0:07 UTC (permalink / raw)
To: René Scharfe; +Cc: Git List
René Scharfe <l.s.r@web.de> 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 <l.s.r@web.de>
> ---
> 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),
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-08-10 0:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-09 10:00 [PATCH] merge: don't document non-existing --compact-summary argument René Scharfe
2025-08-10 0:07 ` Junio C Hamano
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 NNTP newsgroup(s).