Skip to content

Commit 14d16e2

Browse files
moygitster
authored andcommitted
Documentation/config: default for color.* is color.ui
Since 4c7f181 (make color.ui default to 'auto', 2013-06-10), the default for color.* when nothing is set is 'auto' and we still claimed that the default was 'false'. Be more precise by saying explicitly that the default is to follow color.ui, and recall that the default is 'auto' to avoid one indirection for the reader. Signed-off-by: Matthieu Moy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0b65a8d commit 14d16e2

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

Documentation/config.txt

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,8 @@ color.branch::
924924
A boolean to enable/disable color in the output of
925925
linkgit:git-branch[1]. May be set to `always`,
926926
`false` (or `never`) or `auto` (or `true`), in which case colors are used
927-
only when the output is to a terminal. Defaults to false.
927+
only when the output is to a terminal. If unset, then the
928+
value of `color.ui` is used (`auto` by default).
928929

929930
color.branch.<slot>::
930931
Use customized color for branch coloration. `<slot>` is one of
@@ -939,7 +940,8 @@ color.diff::
939940
linkgit:git-log[1], and linkgit:git-show[1] will use color
940941
for all patches. If it is set to `true` or `auto`, those
941942
commands will only use color when output is to the terminal.
942-
Defaults to false.
943+
If unset, then the value of `color.ui` is used (`auto` by
944+
default).
943945
+
944946
This does not affect linkgit:git-format-patch[1] or the
945947
'git-diff-{asterisk}' plumbing commands. Can be overridden on the
@@ -962,7 +964,8 @@ color.decorate.<slot>::
962964
color.grep::
963965
When set to `always`, always highlight matches. When `false` (or
964966
`never`), never. When set to `true` or `auto`, use color only
965-
when the output is written to the terminal. Defaults to `false`.
967+
when the output is written to the terminal. If unset, then the
968+
value of `color.ui` is used (`auto` by default).
966969

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

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

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

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

0 commit comments

Comments
 (0)