Skip to content

Commit 3d0e75f

Browse files
committed
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 <[email protected]>
1 parent 7e20105 commit 3d0e75f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Documentation/diff-options.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ any of those replacements occurred.
174174

175175
--color[=<when>]::
176176
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`.
179179
ifdef::git-diff[]
180180
It can be changed by the `color.ui` and `color.diff`
181181
configuration settings.

0 commit comments

Comments
 (0)