diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:27:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:27:58 (GMT) |
| commit | 3dadfc7e173e27db641291d8f049ab487b696704 (patch) | |
| tree | 6d5f730dc8994fe9135278eab8790ac342285851 /Documentation | |
| parent | d539eb9d25fdb9a7d820596eb11b04960d8d09ee (diff) | |
| parent | 71b59849753589c3faa04176e875071417ceddd5 (diff) | |
| download | git-3dadfc7e173e27db641291d8f049ab487b696704.zip git-3dadfc7e173e27db641291d8f049ab487b696704.tar.gz git-3dadfc7e173e27db641291d8f049ab487b696704.tar.bz2 | |
Merge branch 'jk/colors'
"diff-highlight" filter (in contrib/) allows its color output
to be customized via configuration variables.
* jk/colors:
parse_color: drop COLOR_BACKGROUND macro
diff-highlight: allow configurable colors
parse_color: recognize "no$foo" to clear the $foo attribute
parse_color: support 24-bit RGB values
parse_color: refactor color storage
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index ac781a4..6862e3e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -849,11 +849,13 @@ 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. +doesn't matter. Attributes may be turned off specifically by prefixing +them with `no` (e.g., `noreverse`, `noul`, etc). + Colors (foreground and background) may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all -terminals may support this). +terminals may support this). If your terminal supports it, you may also +specify 24-bit RGB values as hex, like `#ff0ab3`. color.diff:: Whether to use ANSI escape sequences to add color to patches. |