merge: don't document non-existing --compact-summary argument

Git fork

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

René Scharfe and committed by

Junio C Hamano 7 months ago ad459fd4 c8b48058

+1 -1

1 changed file

expand all

unified split

builtin

merge.c

+1 -1

builtin/merge.c

··· 264 264 OPT_BOOL(0, "stat", &show_diffstat, 265 265 N_("show a diffstat at the end of the merge")), 266 266 OPT_BOOL(0, "summary", &show_diffstat, N_("(synonym to --stat)")), 267 - OPT_CALLBACK_F(0, "compact-summary", &show_diffstat, N_("compact-summary"), 267 + OPT_CALLBACK_F(0, "compact-summary", &show_diffstat, NULL, 268 268 N_("show a compact-summary at the end of the merge"), 269 269 PARSE_OPT_NOARG, 270 270 option_parse_compact_summary),