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

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
maint
Junio C Hamano 2013-03-19 12:11:31 -07:00
parent 048d4d98b3 3d0e75f2f7
commit 3e1b08bbf5
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

@ -195,8 +195,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.