summaryrefslogtreecommitdiffstats
path: root/git-log.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-19 16:07:29 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-19 16:07:29 -0700
commit947ab826679af3ad71f1bd69391deca3bc6edad9 (patch)
tree7a69484c0bf6020bb62b3b2fad6e2d90e4fdaff3 /git-log.html
parentfa156ead3ef3991c2ca287ac33572a01ac404180 (diff)
downloadgit-htmldocs-947ab826679af3ad71f1bd69391deca3bc6edad9.tar.gz
Autogenerated HTML docs for v1.8.2-61-g7b9a4
Diffstat (limited to 'git-log.html')
-rw-r--r--git-log.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-log.html b/git-log.html
index b7ba243f5..b0ca4210b 100644
--- a/git-log.html
+++ b/git-log.html
@@ -2808,8 +2808,8 @@ any of those replacements occurred.</p></div>
<dd>
<p>
Show colored diff.
- The value must be <code>always</code> (the default for <code>&lt;when&gt;</code>), <code>never</code>, or <code>auto</code>.
- The default value is <code>never</code>.
+ <code>--color</code> (i.e. without <em>=&lt;when&gt;</em>) is the same as <code>--color=always</code>.
+ <em>&lt;when&gt;</em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
</p>
</dd>
<dt class="hdlist1">