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 /git-diff.html | |
| parent | fa156ead3ef3991c2ca287ac33572a01ac404180 (diff) | |
| download | git-htmldocs-947ab826679af3ad71f1bd69391deca3bc6edad9.tar.gz | |
Autogenerated HTML docs for v1.8.2-61-g7b9a4
Diffstat (limited to 'git-diff.html')
| -rw-r--r-- | git-diff.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-diff.html b/git-diff.html index 51f69cff2..76060d5ed 100644 --- a/git-diff.html +++ b/git-diff.html @@ -1171,8 +1171,8 @@ any of those replacements occurred.</p></div> <dd>
<p>
Show colored diff.
- The value must be <code>always</code> (the default for <code><when></code>), <code>never</code>, or <code>auto</code>.
- The default value is <code>never</code>.
+ <code>--color</code> (i.e. without <em>=<when></em>) is the same as <code>--color=always</code>.
+ <em><when></em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
It can be changed by the <code>color.ui</code> and <code>color.diff</code>
configuration settings.
</p>
|