summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-26 16:09:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-26 16:09:15 -0700
commit7fcc056dfa3bbab43de6299304a4ce4d32cf7922 (patch)
tree5e666b8c65dbe114626ed2fe9bdf6f15ebcd7bc8 /xdiff-interface.h
parentMerge branch 'rs/cocci' (diff)
parentDocumentation/config: default for color.* is color.ui (diff)
downloadtgif-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 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions