@@ -146,6 +146,16 @@ integer::
146
146
be suffixed with `k`, `M`,... to mean "scale the number by
147
147
1024", "by 1024x1024", etc.
148
148
149
+ color::
150
+ The value for a variables that takes a color is a list of
151
+ colors (at most two) and attributes (at most one), separated
152
+ by spaces. The colors accepted are `normal`, `black`,
153
+ `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and
154
+ `white`; the attributes are `bold`, `dim`, `ul`, `blink` and
155
+ `reverse`. The first color given is the foreground; the
156
+ second is the background. The position of the attribute, if
157
+ any, doesn't matter.
158
+
149
159
150
160
Variables
151
161
~~~~~~~~~
@@ -838,14 +848,6 @@ color.branch.<slot>::
838
848
`remote` (a remote-tracking branch in refs/remotes/),
839
849
`upstream` (upstream tracking branch), `plain` (other
840
850
refs).
841
- +
842
- The value for these configuration variables is a list of colors (at most
843
- two) and attributes (at most one), separated by spaces. The colors
844
- accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`,
845
- `magenta`, `cyan` and `white`; the attributes are `bold`, `dim`, `ul`,
846
- `blink` and `reverse`. The first color given is the foreground; the
847
- second is the background. The position of the attribute, if any,
848
- doesn't matter.
849
851
850
852
color.diff::
851
853
Whether to use ANSI escape sequences to add color to patches.
@@ -865,8 +867,7 @@ color.diff.<slot>::
865
867
of `plain` (context text), `meta` (metainformation), `frag`
866
868
(hunk header), 'func' (function in hunk header), `old` (removed lines),
867
869
`new` (added lines), `commit` (commit headers), or `whitespace`
868
- (highlighting whitespace errors). The values of these variables may be
869
- specified as in color.branch.<slot>.
870
+ (highlighting whitespace errors).
870
871
871
872
color.decorate.<slot>::
872
873
Use customized color for 'git log --decorate' output. `<slot>` is one
@@ -899,8 +900,6 @@ color.grep.<slot>::
899
900
separators between fields on a line (`:`, `-`, and `=`)
900
901
and between hunks (`--`)
901
902
--
902
- +
903
- The values of these variables may be specified as in color.branch.<slot>.
904
903
905
904
color.interactive::
906
905
When set to `always`, always use colors for interactive prompts
@@ -913,8 +912,7 @@ color.interactive.<slot>::
913
912
Use customized color for 'git add --interactive' and 'git clean
914
913
--interactive' output. `<slot>` may be `prompt`, `header`, `help`
915
914
or `error`, for four distinct types of normal output from
916
- interactive commands. The values of these variables may be
917
- specified as in color.branch.<slot>.
915
+ interactive commands.
918
916
919
917
color.pager::
920
918
A boolean to enable/disable colored output when the pager is in
@@ -940,8 +938,7 @@ color.status.<slot>::
940
938
`untracked` (files which are not tracked by Git),
941
939
`branch` (the current branch), or
942
940
`nobranch` (the color the 'no branch' warning is shown in, defaulting
943
- to red). The values of these variables may be specified as in
944
- color.branch.<slot>.
941
+ to red).
945
942
946
943
color.ui::
947
944
This variable determines the default value for variables such
0 commit comments