From: Junio C Hamano <junio@hera.kernel.org>
Date: Wed, 18 Apr 2007 23:54:28 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.5.1.1-178-g6fb8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6bd6ce4393e00dcbe6043c4f1f1440537e9c9e5;p=git.git

Autogenerated HTML docs for v1.5.1.1-178-g6fb8
---

diff --git a/RelNotes-1.5.1.1.txt b/RelNotes-1.5.1.1.txt
index 3054b5a3f..91471213b 100644
--- a/RelNotes-1.5.1.1.txt
+++ b/RelNotes-1.5.1.1.txt
@@ -59,3 +59,7 @@ Fixes since v1.5.1
 
   - git-svn dcommit and rebase was confused by patches that were
     merged from another branch that is managed by git-svn.
+
+  - git-svn used to get confused when globbing remote branch/tag
+    spec (e.g. "branches = proj/branches/*:refs/remotes/origin/*")
+    is used and there was a plain file that matched the glob.
diff --git a/git-shortlog.html b/git-shortlog.html
index d04c03472..8c616e586 100644
--- a/git-shortlog.html
+++ b/git-shortlog.html
@@ -272,8 +272,9 @@ git-shortlog(1) Manual Page
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p>git-log --pretty=short | <em>git-shortlog</em> [-h] [-n] [-s]
-git-shortlog [-n|--number] [-s|--summary] [&lt;committish&gt;&#8230;]</p>
+<div class="verseblock">
+<div class="content">git-log --pretty=short | <em>git-shortlog</em> [-h] [-n] [-s]
+git-shortlog [-n|--number] [-s|--summary] [&lt;committish&gt;&#8230;]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -314,25 +315,20 @@ the first line of the commit message will be shown.</p>
 </div>
 <h2>FILES</h2>
 <div class="sectionbody">
-<dl>
-<dt>
-<em>.mailmap</em>
-</dt>
-<dd>
-<p>
-        If this file 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
-        <em>&lt;</em> and <em>&gt;</em>. Use hash <em>#</em> for comments. Example:
-</p>
+<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
+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">
 <div class="content">
 <pre><tt># Keep alphabetized
 Adam Morrow &lt;adam@localhost.localdomain&gt;
 Eve Jones &lt;eve@laptop.(none)&gt;</tt></pre>
 </div></div>
-</dd>
-</dl>
 </div>
 <h2>Author</h2>
 <div class="sectionbody">
@@ -348,7 +344,7 @@ Eve Jones &lt;eve@laptop.(none)&gt;</tt></pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 04-Apr-2007 18:34:19 UTC
+Last updated 18-Apr-2007 23:54:12 UTC
 </div>
 </div>
 </body>
diff --git a/git-shortlog.txt b/git-shortlog.txt
index b0df92e81..1c8c55ef6 100644
--- a/git-shortlog.txt
+++ b/git-shortlog.txt
@@ -7,6 +7,7 @@ git-shortlog - Summarize 'git log' output
 
 SYNOPSIS
 --------
+[verse]
 git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s]
 git-shortlog [-n|--number] [-s|--summary] [<committish>...]
 
@@ -33,7 +34,8 @@ OPTIONS
 
 FILES
 -----
-'.mailmap'::
+
+.mailmap::
 	If this file 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