diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-06-30 14:30:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-30 14:30:31 -0700 |
| commit | d2e49d2b7682651283fbc1160e0bdb13eaf24df8 (patch) | |
| tree | bf225d486af17ec333c46199cbcddfc4bc7b7d6e /builtin/pull.c | |
| parent | 91f10d7ca2c41922a7c8b07aec90167896c5db51 (diff) | |
| parent | c8b4805897aa12305389c76480e1d59c4696f2ac (diff) | |
| download | git-d2e49d2b7682651283fbc1160e0bdb13eaf24df8.tar.xz | |
Merge branch 'jc/merge-compact-summary'
"git merge/pull" has been taught the "--compact-summary" option to
use the compact-summary format, intead of diffstat, when showing
the summary of the incoming changes.
* jc/merge-compact-summary:
merge/pull: extend merge.stat configuration variable to cover --compact-summary
merge/pull: add the "--compact-summary" option
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index a1ebc6ad33..6e72a2e9a4 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -143,6 +143,9 @@ static struct option pull_options[] = { OPT_PASSTHRU(0, "summary", &opt_diffstat, NULL, N_("(synonym to --stat)"), PARSE_OPT_NOARG | PARSE_OPT_HIDDEN), + OPT_PASSTHRU(0, "compact-summary", &opt_diffstat, NULL, + N_("show a compact-summary at the end of the merge"), + PARSE_OPT_NOARG), OPT_PASSTHRU(0, "log", &opt_log, N_("n"), N_("add (at most <n>) entries from shortlog to merge commit message"), PARSE_OPT_OPTARG), |