diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-06-12 15:25:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-13 11:50:37 -0700 |
| commit | 3a54f5bd5db0478c39a52b4da149e3c2413f46eb (patch) | |
| tree | 09e0f31394a5c17310bc6702b5499c292410aba8 /builtin/pull.c | |
| parent | 83cb7ae638f7eb108d107b0430a01648fb861e2c (diff) | |
merge/pull: add the "--compact-summary" option
"git merge" and "git pull" shows "git diff --stat --summary @{1}"
when they finish to indicate the extent of the changes brought into
the history by default. While it gives a good overview, it becomes
annoying when there are very many created or deleted paths.
Introduce "--compact-summary" option to these two commands that
tells it to instead show "git diff --compact-summary @{1}", which
gives the same information in a lot more compact form in such a
situation.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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), |