From 3d0e75f2f7a9ae9329154dc85bf5af5c5482f3ea Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 22 Feb 2013 22:24:10 -0800 Subject: 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 --- Documentation/diff-options.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index cf4b216598..d33f77a05e 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -174,8 +174,8 @@ any of those replacements occurred. --color[=]:: Show colored diff. - The value must be `always` (the default for ``), `never`, or `auto`. - The default value is `never`. + `--color` (i.e. without '=') is the same as `--color=always`. + '' can be one of `always`, `never`, or `auto`. ifdef::git-diff[] It can be changed by the `color.ui` and `color.diff` configuration settings. -- cgit v1.2.1