On Fri, Jun 13, 2025, at 00:25, Junio C Hamano wrote:
> Extend it to be "Boolean or text", that takes false, true, or
> "compact", with the last one triggering the --compact-summary
> option introduced earlier.
Would it make sense to make `diffstat` an alias for `true`? I’m not
sure since you need to keep `true` anyway so you still have that
historical artifact (?)[1] of `true` meaning `diffstat`.
† 1: In the sense of what was added first
Also
> "compact", with the last one triggering the --compact-summary
> option introduced earlier.
So `merge.stat` can be used instead of `--compact-summary`. But now the
option does not mention `merge.stat`?
> `merge.stat`::
> - Whether to print the diffstat between `ORIG_HEAD` and the merge result
> - at the end of the merge. True by default.
> + What, if anything, to print between `ORIG_HEAD` and the merge result
> + at the end of the merge. Possible values are:
> ++
> +--
> +`false`;; Show nothing.
> +`true`;; Show `git diff --diffstat ORIG_HEAD`.
> +`compact`;; Show `git diff --compact-summary ORIG_HEAD`.
I can’t run `git diff --diffstat ORIG_HEAD`. `--diffstat` is not
an option.
> +If this variable is left unspecified, it defaults to `true`.
I think this is simpler:
Defaults to `true`.
There’s also several places in this doc which uses something similar
judging by a search for “defaults to”. Only exception is
`merge.renameLimit`:
If not specified, defaults to
