kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Junio C Hamano 2013-02-22 22:24:10 -08:00
parent 7e2010537e
commit 3d0e75f2f7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/diff-options.txt
View File

@ -174,8 +174,8 @@ any of those replacements occurred.


--color[=<when>]:: --color[=<when>]::
Show colored diff. Show colored diff.
The value must be `always` (the default for `<when>`), `never`, or `auto`. `--color` (i.e. without '=<when>') is the same as `--color=always`.
The default value is `never`. '<when>' can be one of `always`, `never`, or `auto`.
ifdef::git-diff[] ifdef::git-diff[]
It can be changed by the `color.ui` and `color.diff` It can be changed by the `color.ui` and `color.diff`
configuration settings. configuration settings.