Skip to content

Commit a74a3b7

Browse files
committed
Merge branch 'mm/config-color-ui-default-to-auto' into maint
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
2 parents eb293ac + 14d16e2 commit a74a3b7

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

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

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

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

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

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

0 commit comments

Comments
 (0)