diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:44:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:44:53 -0700 |
| commit | 82b955c513e403adaf7b39ea621678bbce6b2ede (patch) | |
| tree | 3f90b03cb405cf14a17e8bce0d45ad4466e161b9 /Documentation/diff-options.txt | |
| parent | 617cf93182279eec554dda03f44ac6a250e183aa (diff) | |
| parent | 3d0e75f2f7a9ae9329154dc85bf5af5c5482f3ea (diff) | |
| download | git-82b955c513e403adaf7b39ea621678bbce6b2ede.tar.gz | |
Merge branch 'jc/color-diff-doc' into maint-1.8.1
The "--color=<when>" argument to the commands in the diff family
was described poorly.
* jc/color-diff-doc:
diff-options: unconfuse description of --color
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 39f2c5074c..bbfe8f8f35 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -175,8 +175,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. |