Skip to content

Commit ad459fd

Browse files
rscharfegitster
authored andcommitted
merge: don't document non-existing --compact-summary argument
3a54f5b (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c8b4805 commit ad459fd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/merge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ static struct option builtin_merge_options[] = {
264264
OPT_BOOL(0, "stat", &show_diffstat,
265265
N_("show a diffstat at the end of the merge")),
266266
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,
268268
N_("show a compact-summary at the end of the merge"),
269269
PARSE_OPT_NOARG,
270270
option_parse_compact_summary),

0 commit comments

Comments
 (0)