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

Documentation/config.txt: Fix documentation of colour config tweaks. 

* The description of valid colour specifications was rather
    incomplete, so fix it so that it actually describes colour specs as
    accepted by color_parse().

  * The list of colour items allowed in color.diff.BLAH was missing the
    `commit' and `whitespace' entries.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Mark Wooding 2007-01-28 15:17:36 +00:00 committed by Junio C Hamano
parent c3e821c636
commit 4f193f20a3
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Documentation/config.txt
View File

@ -250,10 +250,15 @@ color.branch.<slot>::
Use customized color for branch coloration. `<slot>` is one of Use customized color for branch coloration. `<slot>` is one of
`current` (the current branch), `local` (a local branch), `current` (the current branch), `local` (a local branch),
`remote` (a tracking branch in refs/remotes/), `plain` (other `remote` (a tracking branch in refs/remotes/), `plain` (other
refs), or `reset` (the normal terminal color). The value for refs).
these configuration variables can be one of: `normal`, `bold`, +
`dim`, `ul`, `blink`, `reverse`, `reset`, `black`, `red`, The value for these configuration variables is a list of colors (at most
`green`, `yellow`, `blue`, `magenta`, `cyan`, or `white`. two) and attributes (at most one), separated by spaces. The colors
accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`,
`magenta`, `cyan` and `white`; the attributes are `bold`, `dim`, `ul`,
`blink` and `reverse`. The first color given is the foreground; the
second is the background. The position of the attribute, if any,
doesn't matter.


color.diff:: color.diff::
When true (or `always`), always use colors in patch. When true (or `always`), always use colors in patch.
@ -261,12 +266,13 @@ color.diff::
colors only when the output is to the terminal. colors only when the output is to the terminal.


color.diff.<slot>:: color.diff.<slot>::
Use customized color for diff colorization. `<slot>` Use customized color for diff colorization. `<slot>` specifies
specifies which part of the patch to use the specified which part of the patch to use the specified color, and is one
color, and is one of `plain` (context text), `meta` of `plain` (context text), `meta` (metainformation), `frag`
(metainformation), `frag` (hunk header), `old` (removed (hunk header), `old` (removed lines), `new` (added lines),
lines), or `new` (added lines). The values of these `commit` (commit headers), or `whitespace` (highlighting dubious
variables may be specified as in color.branch.<slot>. whitespace). The values of these variables may be specified as
in color.branch.<slot>.


color.pager:: color.pager::
A boolean to enable/disable colored output when the pager is in A boolean to enable/disable colored output when the pager is in