From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Jun 2025 21:30:31 +0000 (-0700)
Subject: Merge branch 'jc/merge-compact-summary'
X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=d2e49d2b7682651283fbc1160e0bdb13eaf24df8;p=rit

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
---

d2e49d2b7682651283fbc1160e0bdb13eaf24df8