Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-auto

* jk/ui-color-always-to-auto-maint:
color: make "always" the same as "auto" in config
provide --color option for all ref-filter users
t3205: use --color instead of color.branch=always
t3203: drop "always" color test
t6006: drop "always" color config tests
t7502: use diff.noprefix for --verbose test
t7508: use test_terminal for color output
t3701: use test-terminal to collect color output
t4015: prefer --color to -c color.diff=always
test-terminal: set TERM=vt100

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-for-each-ref.txt
index 66b4e0a4050655e7fab27a6fe72af03d6c99f3b2,b92ebd0cd9820da235967cab937a3ff31d02a187..cbd0a6212a62a618252e7b56397239d4066dcbd7
--- 1/Documentation/git-for-each-ref.txt
--- 2/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@@ -57,6 -49,17 +57,11 @@@ OPTION
        `xx`; for example `%00` interpolates to `\0` (NUL),
        `%09` to `\t` (TAB) and `%0a` to `\n` (LF).
  
 -<pattern>...::
 -      If one or more patterns are given, only refs are shown that
 -      match against at least one pattern, either using fnmatch(3) or
 -      literally, in the latter case matching completely or from the
 -      beginning up to a slash.
 -
+ --color[=<when>]:
+       Respect any colors specified in the `--format` option. The
+       `<when>` field must be one of `always`, `never`, or `auto` (if
+       `<when>` is absent, behave as if `always` was given).
+ 
  --shell::
  --perl::
  --python::

diff --cc Documentation/git-tag.txt
Simple merge

diff --cc builtin/tag.c
Simple merge

diff --cc color.c
Simple merge

diff --cc t/t4015-diff-whitespace.sh
Simple merge

diff --cc t/t4202-log.sh
Simple merge

diff --cc t/t7004-tag.sh
Simple merge

diff --cc t/t7006-pager.sh
Simple merge

diff --cc t/t7301-clean-interactive.sh
index 39212dccd290957194e992883c070f31cd7d9999,3ae394e934d972d29286ecd25596eedd45bee902..1bf9789c8a3cfbb1cc8a6ea33e4a0b1a0da0a7cd
--- 1/t/t7301-clean-interactive.sh
--- 2/t/t7301-clean-interactive.sh
+++ b/t/t7301-clean-interactive.sh
@@@ -473,14 -472,4 +473,14 @@@ test_expect_success 'git clean -id wit
  
  '
  
-       test_terminal env TERM=vt100 git clean -i |
 +test_expect_success TTY 'git clean -i paints the header in HEADER color' '
 +      >a.out &&
 +      echo q |
++      test_terminal git clean -i |
 +      test_decode_color |
 +      head -n 1 >header &&
 +      # not i18ngrep
 +      grep "^<BOLD>" header
 +'
 +
  test_done

diff --cc t/t7508-status.sh
Simple merge