diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-11 21:30:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-11 21:30:16 -0700 |
| commit | 22dd6abc321b49e7c785eb2e1fb6a6a9771dd18c (patch) | |
| tree | 84f805f240d9adb2faf97550de340ac62374cdcf | |
| parent | Merge branch 'rs/for-each-ref-start-after-marker-fix' (diff) | |
| parent | merge: don't document non-existing --compact-summary argument (diff) | |
| download | git-22dd6abc321b49e7c785eb2e1fb6a6a9771dd18c.tar.gz git-22dd6abc321b49e7c785eb2e1fb6a6a9771dd18c.zip | |
Merge branch 'rs/merge-compact-summary'
Hotfix.
* rs/merge-compact-summary:
merge: don't document non-existing --compact-summary argument
| -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 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), |