summaryrefslogtreecommitdiffstats
path: root/git-log.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-20 18:01:53 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-20 18:01:53 -0800
commitce836cc2c88ad3e08aa7d9cc87292f40fa0d2258 (patch)
tree92643ccc751006cbdf2c9aa19aaa7ecd15a22a67 /git-log.html
parent5dd5faeb69b77fe53fdaee9e9a6480cfde24052a (diff)
downloadgit-htmldocs-ce836cc2c88ad3e08aa7d9cc87292f40fa0d2258.tar.gz
Autogenerated HTML docs for v1.8.1.1-293-gfe737
Diffstat (limited to 'git-log.html')
-rw-r--r--git-log.html12
1 files changed, 11 insertions, 1 deletions
diff --git a/git-log.html b/git-log.html
index 9d810685f..37beb06fd 100644
--- a/git-log.html
+++ b/git-log.html
@@ -811,6 +811,16 @@ each commit introduces are shown.</p></div>
</p>
</dd>
<dt class="hdlist1">
+--use-mailmap
+</dt>
+<dd>
+<p>
+ Use mailmap file to map author and committer names and email
+ to canonical real names and email addresses. See
+ <a href="git-shortlog.html">git-shortlog(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
--full-diff
</dt>
<dd>
@@ -3714,7 +3724,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 2013-01-06 01:05:36 PST
+Last updated 2013-01-20 18:01:21 PST
</div>
</div>
</body>