From: Junio C Hamano Date: Wed, 18 Oct 2017 05:20:43 +0000 (+0900) Subject: Merge branch 'jk/ref-filter-colors-fix' into maint X-Git-Tag: v2.15.0-rc2~5^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3e3c6a43e7f36d507129909e49d54f1e8ad65e2;p=thirdparty%2Fgit.git Merge branch 'jk/ref-filter-colors-fix' into maint 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. * 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" 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 --- e3e3c6a43e7f36d507129909e49d54f1e8ad65e2 diff --cc Documentation/git-for-each-ref.txt index 66b4e0a405,8bbeeba291..cbd0a6212a --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@@ -57,6 -50,17 +57,11 @@@ OPTION `xx`; for example `%00` interpolates to `\0` (NUL), `%09` to `\t` (TAB) and `%0a` to `\n` (LF). -...:: - 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[=]: + Respect any colors specified in the `--format` option. The + `` field must be one of `always`, `never`, or `auto` (if + `` is absent, behave as if `always` was given). + --shell:: --perl:: --python::