diff-options: unconfuse description of --color
It said "by default it is off" while it also said "the default is always", which confused everybody who read it only once. It wanted to say (1) if you do not say --color, it is not enabled, and (2) if you say --color but do not say when to enable it, it will always be enabled". Rephrase to clarify by using "default" only once. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Feb 22, 2013 at 22:24 UTC
3d0e75f2f7a9ae9329154dc85bf5af5c5482f3ea
1 file changed
+2
-2
Documentation/diff-options.txt
+2
-2
@@ -174,8 +174,8 @@ any of those replacements occurred.
174
175
--color[=<when>]::
176
Show colored diff.
177
- The value must be `always` (the default for `<when>`), `never`, or `auto`.
178
- The default value is `never`.
177
+ `--color` (i.e. without '=<when>') is the same as `--color=always`.
178
+ '<when>' can be one of `always`, `never`, or `auto`.
179
ifdef::git-diff[]
180
It can be changed by the `color.ui` and `color.diff`
181
configuration settings.