Merge branch 'jc/color-diff-doc'
The --color[=<when>] option to the diff family was documented in a confusing way. * jc/color-diff-doc: diff-options: unconfuse description of --color
This commit is contained in:
commit
3e1b08bbf5
@ -195,8 +195,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.
|
||||
|
Loading…
Reference in New Issue
Block a user