]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 91f10d7 c8b4805)
Merge branch 'jc/merge-compact-summary'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Jun 2025 21:30:31 +0000 (14:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Jun 2025 21:30:31 +0000 (14:30 -0700)
commitd2e49d2b7682651283fbc1160e0bdb13eaf24df8
treebf225d486af17ec333c46199cbcddfc4bc7b7d6etree | snapshot
parent91f10d7ca2c41922a7c8b07aec90167896c5db51commit | diff
parentc8b4805897aa12305389c76480e1d59c4696f2accommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.