Thread (5 messages) 5 messages, 2 authors, 2025-06-13
STALE376d

[PATCH v2 0/2] git pull/merge --compact-summary

From: Junio C Hamano <hidden>
Date: 2025-06-12 22:25:40

By default, "git merge" and "git pull" shows "git diff --stat @{1}"
to show the extent of the changes.  While it gives a good overview,
one thing that is missing in this output is which paths are created
and/or deleted.

With these two patches, these commands learn "--compact-summary"
command line option and a new value "compact" for the existing
merge.stat configuration variable, to change that final output to
use "git diff --compact-summary @{1}" instead.

I sent this out with random fix-ups in separate threads but never
made a formal patch series.  Here are the earlier messages:

 https://lore.kernel.org/git/xmqq5xh6xlpm.fsf@gitster.g/ (local)
 https://lore.kernel.org/git/xmqqfrg6i57t.fsf@gitster.g/ (local)

Junio C Hamano (2):
  merge/pull: --compact-summary
  merge/pull: extend merge.stat configuration variable to cover
    --compact-summary

 Documentation/config/merge.adoc  | 12 ++++++--
 Documentation/git-merge.adoc     |  2 +-
 Documentation/merge-options.adoc |  3 ++
 builtin/merge.c                  | 53 +++++++++++++++++++++++++++++---
 builtin/pull.c                   |  3 ++
 t/t7600-merge.sh                 | 43 +++++++++++++++++++++++++-
 6 files changed, 108 insertions(+), 8 deletions(-)

-- 
2.50.0-rc2-255-gd84100c98d
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help