diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-27 01:30:28 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-29 04:33:17 +0300 |
| commit | 57f2b8424ade734550731392e90b8f738d478e02 (patch) | |
| tree | 7062a3004200e9d7982e45db90998031542f2755 /merge-tree.c | |
| parent | d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9 (diff) | |
"color.diff = true" is not "always" anymore.
Too many people got burned by setting color.diff and color.status to
true when they really should have set it to "auto".
This makes only "always" to do the unconditional colorization, and
change the meaning of "true" to the same as "auto": colorize only when
we are talking to a terminal.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions