kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'mm/config-color-ui-default-to-auto' 

Documentation for individual configuration variables to control use
of color (like `color.grep`) said that their default value is
'false', instead of saying their default is taken from `color.ui`.
When we updated the default value for color.ui from 'false' to
'auto' quite a while ago, all of them broke.  This has been
corrected.

* mm/config-color-ui-default-to-auto:
  Documentation/config: default for color.* is color.ui
maint
Junio C Hamano 2016-09-26 16:09:14 -07:00
parent 85f34a929d 14d16e2b35
commit 7fcc056dfa
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Documentation/config.txt
View File

@ -953,7 +953,8 @@ color.branch::
A boolean to enable/disable color in the output of A boolean to enable/disable color in the output of
linkgit:git-branch[1]. May be set to `always`, linkgit:git-branch[1]. May be set to `always`,
`false` (or `never`) or `auto` (or `true`), in which case colors are used `false` (or `never`) or `auto` (or `true`), in which case colors are used
only when the output is to a terminal. Defaults to false. only when the output is to a terminal. If unset, then the
value of `color.ui` is used (`auto` by default).


color.branch.<slot>:: color.branch.<slot>::
Use customized color for branch coloration. `<slot>` is one of Use customized color for branch coloration. `<slot>` is one of
@ -968,7 +969,8 @@ color.diff::
linkgit:git-log[1], and linkgit:git-show[1] will use color linkgit:git-log[1], and linkgit:git-show[1] will use color
for all patches. If it is set to `true` or `auto`, those for all patches. If it is set to `true` or `auto`, those
commands will only use color when output is to the terminal. commands will only use color when output is to the terminal.
Defaults to false. If unset, then the value of `color.ui` is used (`auto` by
default).
+ +
This does not affect linkgit:git-format-patch[1] or the This does not affect linkgit:git-format-patch[1] or the
'git-diff-{asterisk}' plumbing commands. Can be overridden on the 'git-diff-{asterisk}' plumbing commands. Can be overridden on the
@ -991,7 +993,8 @@ color.decorate.<slot>::
color.grep:: color.grep::
When set to `always`, always highlight matches. When `false` (or When set to `always`, always highlight matches. When `false` (or
`never`), never. When set to `true` or `auto`, use color only `never`), never. When set to `true` or `auto`, use color only
when the output is written to the terminal. Defaults to `false`. when the output is written to the terminal. If unset, then the
value of `color.ui` is used (`auto` by default).


color.grep.<slot>:: color.grep.<slot>::
Use customized color for grep colorization. `<slot>` specifies which Use customized color for grep colorization. `<slot>` specifies which
@ -1024,7 +1027,8 @@ color.interactive::
and displays (such as those used by "git-add --interactive" and and displays (such as those used by "git-add --interactive" and
"git-clean --interactive"). When false (or `never`), never. "git-clean --interactive"). When false (or `never`), never.
When set to `true` or `auto`, use colors only when the output is When set to `true` or `auto`, use colors only when the output is
to the terminal. Defaults to false. to the terminal. If unset, then the value of `color.ui` is
used (`auto` by default).


color.interactive.<slot>:: color.interactive.<slot>::
Use customized color for 'git add --interactive' and 'git clean Use customized color for 'git add --interactive' and 'git clean
@ -1040,13 +1044,15 @@ color.showBranch::
A boolean to enable/disable color in the output of A boolean to enable/disable color in the output of
linkgit:git-show-branch[1]. May be set to `always`, linkgit:git-show-branch[1]. May be set to `always`,
`false` (or `never`) or `auto` (or `true`), in which case colors are used `false` (or `never`) or `auto` (or `true`), in which case colors are used
only when the output is to a terminal. Defaults to false. only when the output is to a terminal. If unset, then the
value of `color.ui` is used (`auto` by default).


color.status:: color.status::
A boolean to enable/disable color in the output of A boolean to enable/disable color in the output of
linkgit:git-status[1]. May be set to `always`, linkgit:git-status[1]. May be set to `always`,
`false` (or `never`) or `auto` (or `true`), in which case colors are used `false` (or `never`) or `auto` (or `true`), in which case colors are used
only when the output is to a terminal. Defaults to false. only when the output is to a terminal. If unset, then the
value of `color.ui` is used (`auto` by default).


color.status.<slot>:: color.status.<slot>::
Use customized color for status colorization. `<slot>` is Use customized color for status colorization. `<slot>` is