diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-22 22:24:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-22 22:24:10 -0800 |
| commit | 3d0e75f2f7a9ae9329154dc85bf5af5c5482f3ea (patch) | |
| tree | 9adbcea8c1aa6dc40ffb9861489642bf9aee574b /Documentation/diff-options.txt | |
| parent | 7e2010537e96d0a1144520222f20ba1dc3d61441 (diff) | |
| download | git-3d0e75f2f7a9ae9329154dc85bf5af5c5482f3ea.tar.gz | |
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>
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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[=<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. |