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 3054b5a3f003ad7a223d10910917a99ed4a76fd0..91471213bdec8d95209db256f594b0e1b3f3ec2a 100644 (file)
--- 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 d04c034722d1eb0732c6e6f54bf42f3b2411b21e..8c616e586fbf404240921feadbd290af8c5ebe85 100644 (file)
--- a/git-shortlog.html
+++ b/git-shortlog.html
@@ -272,8 +272,9 @@ git-shortlog(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p>git-log --pretty=short | <em>git-shortlog</em> [-h] [-n] [-s]\r
-git-shortlog [-n|--number] [-s|--summary] [&lt;committish&gt;&#8230;]</p>\r
+<div class="verseblock">\r
+<div class="content">git-log --pretty=short | <em>git-shortlog</em> [-h] [-n] [-s]\r
+git-shortlog [-n|--number] [-s|--summary] [&lt;committish&gt;&#8230;]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -314,25 +315,20 @@ the first line of the commit message will be shown.</p>
 </div>\r
 <h2>FILES</h2>\r
 <div class="sectionbody">\r
-<dl>\r
-<dt>\r
-<em>.mailmap</em>\r
-</dt>\r
-<dd>\r
-<p>\r
-        If this file exists, it will be used for mapping author email\r
-        addresses to a real author name. One mapping per line, first\r
-        the author name followed by the email address enclosed by\r
-        <em>&lt;</em> and <em>&gt;</em>. Use hash <em>#</em> for comments. Example:\r
-</p>\r
+<div class="literalblock">\r
+<div class="title">mailmap::</div>\r
+<div class="content">\r
+<pre><tt>If this file exists, it will be used for mapping author email\r
+addresses to a real author name. One mapping per line, first\r
+the author name followed by the email address enclosed by\r
+'&lt;' and '&gt;'. Use hash '#' for comments. Example:</tt></pre>\r
+</div></div>\r
 <div class="literalblock">\r
 <div class="content">\r
 <pre><tt># Keep alphabetized\r
 Adam Morrow &lt;adam@localhost.localdomain&gt;\r
 Eve Jones &lt;eve@laptop.(none)&gt;</tt></pre>\r
 </div></div>\r
-</dd>\r
-</dl>\r
 </div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
@@ -348,7 +344,7 @@ Eve Jones &lt;eve@laptop.(none)&gt;</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:19 UTC\r
+Last updated 18-Apr-2007 23:54:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-shortlog.txt b/git-shortlog.txt
index b0df92e8192bc494e5d4db1707c233790560afb8..1c8c55ef6eac57d5bcc1cad7afbecd354af9d3ab 100644 (file)
--- 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