Skip to content

Commit

Permalink
diff-options: unconfuse description of --color
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Feb 23, 2013
1 parent 7e20105 commit 3d0e75f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Documentation/diff-options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 3d0e75f

Please sign in to comment.