diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-06-30 14:30:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-30 14:30:31 -0700 |
| commit | d2e49d2b7682651283fbc1160e0bdb13eaf24df8 (patch) | |
| tree | bf225d486af17ec333c46199cbcddfc4bc7b7d6e /help.c | |
| parent | Merge branch 'bc/stash-export-import' (diff) | |
| parent | merge/pull: extend merge.stat configuration variable to cover --compact-summary (diff) | |
| download | git-d2e49d2b7682651283fbc1160e0bdb13eaf24df8.tar.gz git-d2e49d2b7682651283fbc1160e0bdb13eaf24df8.zip | |
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
Diffstat (limited to 'help.c')
0 files changed, 0 insertions, 0 deletions