From: Junio C Hamano <junio@hera.kernel.org>
Date: Tue, 28 Feb 2006 00:09:58 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.2.2-gf3a4
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=93b02f2eb4250ef2aaac579e763b98efce382bf1;p=git.git

Autogenerated HTML docs for v1.2.2-gf3a4
---

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