diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-06 01:06:32 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-06 01:06:32 -0800 |
commit | abad6da146b5fe8e34f22bcbf31be3cb3e9b08e0 (patch) | |
tree | 85e1e4b4fcd9b473ecbe709db2d9262dc57ad21d /git-show.html | |
parent | 085534867cb82e0690945a1645554999bcfa542a (diff) | |
download | git-htmldocs-abad6da146b5fe8e34f22bcbf31be3cb3e9b08e0.tar.gz |
Autogenerated HTML docs for v1.8.1-151-g32238a
Diffstat (limited to 'git-show.html')
-rw-r--r-- | git-show.html | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-show.html b/git-show.html index 176c34b2a..37a1dae90 100644 --- a/git-show.html +++ b/git-show.html @@ -1273,7 +1273,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff </li>
<li>
<p>
-<em>%C(…)</em>: color specification, as described in color.branch.* config option
+<em>%C(…)</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>
|