From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Sep 2016 23:09:14 +0000 (-0700)
Subject: Merge branch 'mm/config-color-ui-default-to-auto'
X-Git-Tag: v2.11.0-rc0~117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fcc056dfa3bbab43de6299304a4ce4d32cf7922;p=thirdparty%2Fgit.git

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
---

7fcc056dfa3bbab43de6299304a4ce4d32cf7922