From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Mar 2013 20:44:53 +0000 (-0700)
Subject: Merge branch 'jc/color-diff-doc' into maint-1.8.1
X-Git-Tag: v1.8.1.6~26
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/82b955c513e403adaf7b39ea621678bbce6b2ede?hp=617cf93182279eec554dda03f44ac6a250e183aa

Merge branch 'jc/color-diff-doc' into maint-1.8.1

The "--color=<when>" argument to the commands in the diff family
was described poorly.

* jc/color-diff-doc:
diff-options: unconfuse description of --color
---

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 39f2c5074c..bbfe8f8f35 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -175,8 +175,8 @@ any of those replacements occurred.
 
 --color[=<when>]::
 	Show colored diff.
-	The value must be `always` (the default for `<when>`), `never`, or `auto`.
-	The default value is `never`.
+	`--color` (i.e. without '=<when>') is the same as `--color=always`.
+	'<when>' can be one of `always`, `never`, or `auto`.
 ifdef::git-diff[]
 	It can be changed by the `color.ui` and `color.diff`
 	configuration settings.