summaryrefslogtreecommitdiffstats
path: root/git-whatchanged.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-06 01:06:32 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-06 01:06:32 -0800
commitabad6da146b5fe8e34f22bcbf31be3cb3e9b08e0 (patch)
tree85e1e4b4fcd9b473ecbe709db2d9262dc57ad21d /git-whatchanged.html
parent085534867cb82e0690945a1645554999bcfa542a (diff)
downloadgit-htmldocs-abad6da146b5fe8e34f22bcbf31be3cb3e9b08e0.tar.gz
Autogenerated HTML docs for v1.8.1-151-g32238a
Diffstat (limited to 'git-whatchanged.html')
-rw-r--r--git-whatchanged.html6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-whatchanged.html b/git-whatchanged.html
index 4d9ed2aab..d2beace5b 100644
--- a/git-whatchanged.html
+++ b/git-whatchanged.html
@@ -1305,7 +1305,11 @@ The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff
</li>
<li>
<p>
-<em>%C(&#8230;)</em>: color specification, as described in color.branch.* config option
+<em>%C(&#8230;)</em>: color specification, as described in color.branch.* config option;
+ adding <code>auto,</code> at the beginning will emit color only when colors are
+ enabled for log output (by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and
+ respecting the <code>auto</code> settings of the former if we are going to a
+ terminal)
</p>
</li>
<li>