diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-19 12:11:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-19 12:11:32 -0700 |
| commit | 3e1b08bbf58173df80895af3bf86d14c77efe877 (patch) | |
| tree | 9ad8bb6901aafc57924d93e6c8780e7eb7c3a4ef /Documentation/diff-options.txt | |
| parent | 048d4d98b35e78c44d93b8009f7b11823660e007 (diff) | |
| parent | 3d0e75f2f7a9ae9329154dc85bf5af5c5482f3ea (diff) | |
| download | git-3e1b08bbf58173df80895af3bf86d14c77efe877.tar.gz | |
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
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 869d965a3b..104579dc75 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -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. |