Autogenerated HTML docs for v1.8.1-151-g32238a

1 files changed, 7 insertions, 3 deletions

diff --git a/git-log.html b/git-log.html
index 17da80ad4..9d810685f 100644
--- a/git-log.html
+++ b/git-log.html
@@ -2389,7 +2389,11 @@ The title was >>t4119: test autocomputing -p<n> 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>

@@ -3673,7 +3677,7 @@ log.showroot
 </p>

 </dd>

 <dt class="hdlist1">

-mailmap.file

+mailmap.*

 </dt>

 <dd>

 <p>

@@ -3710,7 +3714,7 @@ and overridden by the <code>--notes=&lt;ref&gt;</code> option.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2012-09-12 15:56:23 PDT

+Last updated 2013-01-06 01:05:36 PST

 </div>

 </div>

 </body>