summaryrefslogtreecommitdiffstats
path: root/git-shortlog.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-12-24 19:31:39 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-12-24 19:31:39 +0000
commit0ec429328154e4d8268651eca7997f99514ece21 (patch)
tree50497506cd32dc991b88c5ed308d0d3dd959dcf9 /git-shortlog.html
parentf556fc2a7c28ca2b4097c2c8b0180de3b8ca7238 (diff)
downloadgit-htmldocs-0ec429328154e4d8268651eca7997f99514ece21.tar.gz
Autogenerated HTML docs for v1.5.4-rc1-23-g3a96
Diffstat (limited to 'git-shortlog.html')
-rw-r--r--git-shortlog.html14
1 files changed, 5 insertions, 9 deletions
diff --git a/git-shortlog.html b/git-shortlog.html
index cff79738f..96cd49eab 100644
--- a/git-shortlog.html
+++ b/git-shortlog.html
@@ -323,15 +323,11 @@ the first line of the commit message will be shown.</p>
</div>
<h2>FILES</h2>
<div class="sectionbody">
-<div class="literalblock">
-<div class="title">mailmap::</div>
-<div class="content">
-<pre><tt>If this file exists, it will be used for mapping author email
-addresses to a real author name. One mapping per line, first
+<p>If the file <tt>.mailmap</tt> exists, it will be used for mapping author
+email addresses to a real author name. One mapping per line, first
the author name followed by the email address enclosed by
-'&lt;' and '&gt;'. Use hash '#' for comments. Example:</tt></pre>
-</div></div>
-<div class="literalblock">
+<em>&lt;</em> and <em>&gt;</em>. Use hash <em>#</em> for comments. Example:</p>
+<div class="listingblock">
<div class="content">
<pre><tt># Keep alphabetized
Adam Morrow &lt;adam@localhost.localdomain&gt;
@@ -352,7 +348,7 @@ Eve Jones &lt;eve@laptop.(none)&gt;</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 13-Dec-2007 02:42:55 UTC
+Last updated 24-Dec-2007 19:31:23 UTC
</div>
</div>
</body>