From: René Scharfe Date: Sat, 9 Aug 2025 10:00:16 +0000 (+0200) Subject: merge: don't document non-existing --compact-summary argument X-Git-Tag: v2.51.0-rc2~2^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad459fd44cf43fe8e506f9c72c54a69407ffcb13;p=thirdparty%2Fgit.git merge: don't document non-existing --compact-summary argument 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/merge.c b/builtin/merge.c index 18b22c0a26..0d39c655e9 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),