diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2016-09-16 09:32:48 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-16 12:34:14 -0700 |
| commit | 14d16e2b359e791cb0e82223c7138363559ff989 (patch) | |
| tree | 8ce1bcab66a7539080e8b12296d4f988f890525c /t/t7605-merge-resolve.sh | |
| parent | 0b65a8dbdb38962e700ee16776a3042beb489060 (diff) | |
| download | git-14d16e2b359e791cb0e82223c7138363559ff989.tar.gz git-14d16e2b359e791cb0e82223c7138363559ff989.tar.xz | |
Documentation/config: default for color.* is color.ui
Since 4c7f181 (make color.ui default to 'auto', 2013-06-10), the
default for color.* when nothing is set is 'auto' and we still claimed
that the default was 'false'. Be more precise by saying explicitly
that the default is to follow color.ui, and recall that the default is
'auto' to avoid one indirection for the reader.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions