diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-08 10:18:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-08 10:18:47 -0700 |
| commit | 20ceead5c356980d502181d0011404ccbdc2cb07 (patch) | |
| tree | e6c60674a5f68ed55809214ab40d8bdb104f897e /Documentation | |
| parent | db05f61738b0b0fb469692560340a0c1edc69734 (diff) | |
| parent | 7b97dfe47ba3a61f09cc26154540d74afdd3283d (diff) | |
| download | git-20ceead5c356980d502181d0011404ccbdc2cb07.tar.xz | |
Merge branch 'bb/rgb-12-bit-colors'
The color parsing code learned to handle 12-bit RGB colors, spelled
as "#RGB" (in addition to "#RRGGBB" that is already supported).
* bb/rgb-12-bit-colors:
color: add support for 12-bit RGB colors
t/t4026-color: add test coverage for invalid RGB colors
t/t4026-color: remove an extra double quote character
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 70b448b132..6f649c997c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -316,7 +316,8 @@ terminals, this is usually not the same as setting to "white black". Colors 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). If your terminal supports it, you may also specify 24-bit RGB values as -hex, like `#ff0ab3`. +hex, like `#ff0ab3`, or 12-bit RGB values like `#f1b`, which is +equivalent to the 24-bit color `#ff11bb`. + The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or "strikethrough" letters). |