diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 05:20:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 05:20:43 (GMT) |
| commit | e3e3c6a43e7f36d507129909e49d54f1e8ad65e2 (patch) | |
| tree | b4ab435d592b835fcc4f0a637d0b758d1600c7cd /Documentation | |
| parent | 4e4a0c6e794f1f37ba7fa65e5e774b9d6c168afc (diff) | |
| parent | b521fd122865dca88b99d05344ec189d39efcefb (diff) | |
| download | git-e3e3c6a43e7f36d507129909e49d54f1e8ad65e2.zip git-e3e3c6a43e7f36d507129909e49d54f1e8ad65e2.tar.gz git-e3e3c6a43e7f36d507129909e49d54f1e8ad65e2.tar.bz2 | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-for-each-ref.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-tag.txt | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index 66b4e0a..cbd0a62 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -57,6 +57,11 @@ OPTIONS `xx`; for example `%00` interpolates to `\0` (NUL), `%09` to `\t` (TAB) and `%0a` to `\n` (LF). +--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 --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 95e9f39..956fc01 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -115,6 +115,11 @@ options for details. variable if it exists, or lexicographic order otherwise. See linkgit:git-config[1]. +--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). + -i:: --ignore-case:: Sorting and filtering tags are case insensitive. |