Skip to content

git pull/merge --compact-summary

Junio C Hamano git 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest2 patches 4 repliesIn review
  2. v11 patch 6 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2merge/pull: --compact-summaryDocumentation/git-merge.adoc Documentation/merge-options.adoc builtin/merge.c +2 more+69 -62 replies
2/2merge/pull: extend merge.stat configuration variable to cover --compact-summaryDocumentation/config/merge.adoc builtin/merge.c t/t7600-merge.sh+41 -42 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

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

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/[email protected]/
https://lore.kernel.org/git/[email protected]/

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(-)
Signature · 1 line
2.50.0-rc2-255-gd84100c98d