diff options
| author | René Scharfe <l.s.r@web.de> | 2025-08-09 12:00:16 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-09 17:11:19 -0700 |
| commit | ad459fd44cf43fe8e506f9c72c54a69407ffcb13 (patch) | |
| tree | 79cd840daab46c275605989df45830da8443588c /builtin/merge.c | |
| parent | c8b4805897aa12305389c76480e1d59c4696f2ac (diff) | |
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 <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
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), |