git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 1/3] Documentation: color.* = true means "auto"
Date: Wed,  5 Dec 2007 18:05:03 -0800	[thread overview]
Message-ID: <1196906706-11170-1-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <475697BC.2090701@viscovery.net>

We forgot to document the earlier sanity-fix.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/config.txt |   14 +++++++-------
 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>::
-- 
1.5.3.7-2132-gbd1cf

  parent reply	other threads:[~2007-12-06  2:05 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-12-05 10:59 [PATCH] Color support for "git-add -i" Junio C Hamano
2007-12-05 12:21 ` Johannes Sixt
2007-12-05 13:52   ` Wincent Colaiuta
2007-12-05 19:46   ` Junio C Hamano
2007-12-06  2:05   ` Junio C Hamano [this message]
2007-12-06  2:05     ` [PATCH 2/3] git config --get-colorbool Junio C Hamano
2007-12-06  2:05       ` [PATCH 3/3] Color support for "git-add -i" Junio C Hamano
2007-12-06  2:05         ` [PATCH 0/3] Reroll colorized "git add -i" Junio C Hamano
2007-12-06  5:40         ` [PATCH 3/3] Color support for "git-add -i" Jeff King
2007-12-06 19:59         ` Wincent Colaiuta
2007-12-06 20:18           ` Junio C Hamano
2007-12-07 12:34             ` Wincent Colaiuta
2007-12-06  5:30       ` [PATCH 2/3] git config --get-colorbool Jeff King
2007-12-06  5:35         ` Jeff King
2007-12-06  6:12         ` Junio C Hamano
2007-12-06  6:17           ` Jeff King
2007-12-06  7:38         ` Eric Wong
2007-12-05 13:55 ` [PATCH] Color support for "git-add -i" Wincent Colaiuta

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1196906706-11170-1-git-send-email-gitster@pobox.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).