diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-06-12 15:25:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-13 11:54:14 -0700 |
| commit | c8b4805897aa12305389c76480e1d59c4696f2ac (patch) | |
| tree | ab9fcd94043463abc24164dba7954c86f4793868 /t/unit-tests/u-string-list.c | |
| parent | 3a54f5bd5db0478c39a52b4da149e3c2413f46eb (diff) | |
merge/pull: extend merge.stat configuration variable to cover --compact-summary
Existing `merge.stat` configuration variable is a Boolean that
defaults to `true` to control `git merge --[no-]stat` behaviour.
Extend it to be "Boolean or text", that takes false, true, or
"compact", with the last one triggering the --compact-summary option
introduced earlier. Any other values are taken as the same as true,
instead of signaling an error---it is not a grave enough offence to
stop their merge.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/unit-tests/u-string-list.c')
0 files changed, 0 insertions, 0 deletions