diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-19 16:07:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-19 16:07:29 -0700 |
| commit | 947ab826679af3ad71f1bd69391deca3bc6edad9 (patch) | |
| tree | 7a69484c0bf6020bb62b3b2fad6e2d90e4fdaff3 /diff-options.txt | |
| parent | fa156ead3ef3991c2ca287ac33572a01ac404180 (diff) | |
| download | git-htmldocs-947ab826679af3ad71f1bd69391deca3bc6edad9.tar.gz | |
Autogenerated HTML docs for v1.8.2-61-g7b9a4
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-options.txt b/diff-options.txt index 869d965a3..104579dc7 100644 --- a/diff-options.txt +++ b/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. |