Autogenerated HTML docs for v1.2.2-gf3a4

diff --git a/git-svnimport.html b/git-svnimport.html
index 9687673..fa31870 100644 (file)
--- a/git-svnimport.html
+++ b/git-svnimport.html
@@ -276,7 +276,8 @@ git-svnimport(1) Manual Page
                 [ -C <GIT_repository> ] [ -i ] [ -u ] [-l limit_rev]\r
                 [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ]\r
                 [ -s start_chg ] [ -m ] [ -r ] [ -M regex ]\r
-                [ -I &lt;ignorefile_name&gt; ] &lt;SVN_repository_URL&gt; [ &lt;path&gt; ]</p>\r
+                [ -I &lt;ignorefile_name&gt; ] [ -A &lt;author_file&gt; ]\r
+                &lt;SVN_repository_URL&gt; [ &lt;path&gt; ]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -376,6 +377,25 @@ incremental SVN imports.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-A &lt;author_file&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Read a file with lines on the form\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>username = User's Full Name &lt;email@addr.es&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>and use "User's Full Name &lt;email@addr.es&gt;" as the GIT\r
+author and committer for Subversion commits made by\r
+"username". If encountering a commit made by a user not in the\r
+list, abort.</tt></pre>\r
+</div></div>\r
+</dd>\r
+<dt>\r
 -m\r
 </dt>\r
 <dd>\r
@@ -489,7 +509,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 27-Feb-2006 07:07:04 UTC\r
+Last updated 28-Feb-2006 00:09:53 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-svnimport.txt b/git-svnimport.txt
index c95ff84..912a808 100644 (file)
--- a/git-svnimport.txt
+++ b/git-svnimport.txt
@@ -13,7 +13,8 @@ SYNOPSIS
                [ -C <GIT_repository> ] [ -i ] [ -u ] [-l limit_rev]
                [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ]
                [ -s start_chg ] [ -m ] [ -r ] [ -M regex ]
-               [ -I <ignorefile_name> ] <SVN_repository_URL> [ <path> ]
+               [ -I <ignorefile_name> ] [ -A <author_file> ]
+               <SVN_repository_URL> [ <path> ]
 
 
 DESCRIPTION
@@ -71,6 +72,16 @@ When importing incrementally, you might need to edit the .git/svn2git file.
        syntaxes are similar enough that using the Subversion patterns
        directly with "-I .gitignore" will almost always just work.)
 
+-A <author_file>::
+       Read a file with lines on the form
+
+         username = User's Full Name <email@addr.es>
+
+       and use "User's Full Name <email@addr.es>" as the GIT
+       author and committer for Subversion commits made by
+       "username". If encountering a commit made by a user not in the
+       list, abort.
+
 -m::
        Attempt to detect merges based on the commit message. This option
        will enable default regexes that try to capture the name source