admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'rs/merge-compact-summary'

Browse Source 
Hotfix.

* rs/merge-compact-summary:
  merge: don't document non-existing --compact-summary argument
This commit is contained in:
Junio C Hamano
2025-08-11 21:30:16 -07:00
parent 10fa89aadc ad459fd44c
commit 22dd6abc32
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/merge.c
View File

@@ -264,7 +264,7 @@ static struct option builtin_merge_options[] = {
OPT_BOOL(0, "stat", &show_diffstat, OPT_BOOL(0, "stat", &show_diffstat,
N_("show a diffstat at the end of the merge")), N_("show a diffstat at the end of the merge")),
OPT_BOOL(0, "summary", &show_diffstat, N_("(synonym to --stat)")), 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"), N_("show a compact-summary at the end of the merge"),
PARSE_OPT_NOARG, PARSE_OPT_NOARG,
option_parse_compact_summary), option_parse_compact_summary),