diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-26 16:09:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-26 16:09:15 -0700 |
| commit | 7fcc056dfa3bbab43de6299304a4ce4d32cf7922 (patch) | |
| tree | 5e666b8c65dbe114626ed2fe9bdf6f15ebcd7bc8 /merge-recursive.h | |
| parent | Merge branch 'rs/cocci' (diff) | |
| parent | Documentation/config: default for color.* is color.ui (diff) | |
| download | tgif-7fcc056dfa3bbab43de6299304a4ce4d32cf7922.tar.xz | |
Merge branch 'mm/config-color-ui-default-to-auto'
Documentation for individual configuration variables to control use
of color (like `color.grep`) said that their default value is
'false', instead of saying their default is taken from `color.ui`.
When we updated the default value for color.ui from 'false' to
'auto' quite a while ago, all of them broke. This has been
corrected.
* mm/config-color-ui-default-to-auto:
Documentation/config: default for color.* is color.ui
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions