aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-06-23 13:38:44 -0400
committerJunio C Hamano <gitster@pobox.com>2016-06-23 11:32:51 -0700
commit5621068f3d3c537b79b76201928c0b06025479ee (patch)
treedbb28952f325a01983a48efb2de98682fa165159 /Documentation
parentdf8e472cc1bbd14a60d22b0b124f07046c6e1fa2 (diff)
downloadgit-5621068f3d3c537b79b76201928c0b06025479ee.tar.gz
git-5621068f3d3c537b79b76201928c0b06025479ee.tar.xz
color: allow "no-" for negating attributes
Using "no-bold" rather than "nobold" is easier to read and more natural to type (to me, anyway, even though I was the person who introduced "nobold" in the first place). It's easy to allow both. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 836f73187..93ecd728a 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -163,7 +163,7 @@ hex, like `#ff0ab3`.
The accepted attributes are `bold`, `dim`, `ul`, `blink`, and `reverse`.
The position of any attributes with respect to the colors (before, after,
or in between), doesn't matter. Specific attributes may be turned off
-by prefixing them with `no` (e.g., `noreverse`, `noul`, etc).
+by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc).
+
For git's pre-defined color slots, the attributes are meant to be reset
at the beginning of each item in the colored output. So setting