From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Oct 2017 01:19:08 +0000 (+0900)
Subject: Merge branch 'jk/ref-filter-colors-fix'
X-Git-Tag: v2.15.0-rc2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c;p=git

Merge branch 'jk/ref-filter-colors-fix'

This is the "theoretically more correct" approach of simply
stepping back to the state before plumbing commands started paying
attention to "color.ui" configuration variable.

Let's run with this one.

* jk/ref-filter-colors-fix:
  tag: respect color.ui config
  Revert "color: check color.ui in git_default_config()"
  Revert "t6006: drop "always" color config tests"
  Revert "color: make "always" the same as "auto" in config"
---

1c0b983a777bf283250aaf00c94a9a9d4bf8bc9c