Merge branch 'jk/ref-filter-colors-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 01:19:08 +0000 (10:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2017 01:19:08 +0000 (10:19 +0900)
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"

1  2 
Documentation/config.txt
builtin/branch.c
builtin/clean.c
builtin/grep.c
builtin/show-branch.c
builtin/tag.c
color.c
config.c
diff.c
t/t6300-for-each-ref.sh
t/t7004-tag.sh

Simple merge
Simple merge
diff --cc builtin/clean.c
Simple merge
diff --cc builtin/grep.c
Simple merge
Simple merge
diff --cc builtin/tag.c
Simple merge
diff --cc color.c
Simple merge
diff --cc config.c
Simple merge
diff --cc diff.c
Simple merge
Simple merge
diff --cc t/t7004-tag.sh
Simple merge