summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-06 01:05:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-06 01:50:53 (GMT)
commitcec99d8cef12d18c71b277a4cd6963d37b13e901 (patch)
treea38840e67660fb62a1ef4f3e4dadd6b34e9af4bb /Documentation/config.txt
parent27ee189163070f53a87e033171a45520f70b242e (diff)
downloadgit-cec99d8cef12d18c71b277a4cd6963d37b13e901.zip
git-cec99d8cef12d18c71b277a4cd6963d37b13e901.tar.gz
git-cec99d8cef12d18c71b277a4cd6963d37b13e901.tar.bz2
Documentation: color.* = true means "auto"
We forgot to document the earlier sanity-fix. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 72a33e9..0e45ec5 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -359,8 +359,8 @@ clean.requireForce::
color.branch::
A boolean to enable/disable color in the output of
- gitlink:git-branch[1]. May be set to `true` (or `always`),
- `false` (or `never`) or `auto`, in which case colors are used
+ gitlink:git-branch[1]. May be set to `always`,
+ `false` (or `never`) or `auto` (or `true`), in which case colors are used
only when the output is to a terminal. Defaults to false.
color.branch.<slot>::
@@ -378,9 +378,9 @@ second is the background. The position of the attribute, if any,
doesn't matter.
color.diff::
- When true (or `always`), always use colors in patch.
- When false (or `never`), never. When set to `auto`, use
- colors only when the output is to the terminal.
+ When set to `always`, always use colors in patch.
+ When false (or `never`), never. When set to `true` or `auto`, use
+ colors only when the output is to the terminal. Defaults to false.
color.diff.<slot>::
Use customized color for diff colorization. `<slot>` specifies
@@ -397,8 +397,8 @@ color.pager::
color.status::
A boolean to enable/disable color in the output of
- gitlink:git-status[1]. May be set to `true` (or `always`),
- `false` (or `never`) or `auto`, in which case colors are used
+ gitlink:git-status[1]. May be set to `always`,
+ `false` (or `never`) or `auto` (or `true`), in which case colors are used
only when the output is to a terminal. Defaults to false.
color.status.<slot>::