X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-svnimport.html;h=ea04c0fed14a3bdc56f493750ded42c0940578a6;hb=7da87bb8f49b5c00786cbfb3e330f690e8b924c6;hp=c8ab35c73471474351e1cfb35df693f08f34855e;hpb=235a91e6b0d1d18a2517cf7e0a18278a6912bdb0;p=git.git

diff --git a/git-svnimport.html b/git-svnimport.html
index c8ab35c7..ea04c0fe 100644
--- a/git-svnimport.html
+++ b/git-svnimport.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -272,26 +272,19 @@ git-svnimport(1) Manual Page
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-svnimport</em> [ -o &lt;branch-for-HEAD&gt; ] [ -h ] [ -v ] [ -d | -D ]
-                        [ -C &lt;GIT_repository&gt; ] [ -i ] [ -u ] [-l limit_rev]
-                        [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ]
-                        [ -s start_chg ] [ -m ] [ -M regex ]
-                        &lt;SVN_repository_URL&gt; [ &lt;path&gt; ]</p>
+<div class="verseblock">
+<div class="content"><em>git-svnimport</em> [ -o &lt;branch-for-HEAD&gt; ] [ -h ] [ -v ] [ -d | -D ]
+                [ -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; ] [ -A &lt;author_file&gt; ]
+                &lt;SVN_repository_URL&gt; [ &lt;path&gt; ]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
 <p>Imports a SVN repository into git. It will either create a new
 repository, or incrementally import into an existing one.</p>
-<div class="hlist"><table>
-<tr>
-<td class="hlist1">
-SVN access is done by the SVN
-</td>
-<td class="hlist2">
-Perl module.
-</td>
-</tr>
-</table></div>
+<p>SVN access is done by the SVN::Perl module.</p>
 <p>git-svnimport assumes that SVN repositories are organized into one
 "trunk" directory where the main development happens, "branch/FOO"
 directories for branches, and "/tags/FOO" directories for tags.
@@ -365,6 +358,47 @@ incremental SVN imports.</p>
 </p>
 </dd>
 <dt>
+-r
+</dt>
+<dd>
+<p>
+        Prepend <em>rX: </em> to commit messages, where X is the imported
+        subversion revision.
+</p>
+</dd>
+<dt>
+-I &lt;ignorefile_name&gt;
+</dt>
+<dd>
+<p>
+        Import the svn:ignore directory property to files with this
+        name in each directory. (The Subversion and GIT ignore
+        syntaxes are similar enough that using the Subversion patterns
+        directly with "-I .gitignore" will almost always just work.)
+</p>
+</dd>
+<dt>
+-A &lt;author_file&gt;
+</dt>
+<dd>
+<p>
+        Read a file with lines on the form
+</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>        username = User's Full Name &lt;email@addr.es&gt;
+</tt></pre>
+</div></div>
+<p>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.</p>
+<p>For convenience, this data is saved to $GIT_DIR/svn-authors
+each time the -A option is provided, and read from that same
+file each time git-svnimport is run with an existing GIT
+repository without -A.</p>
+</dd>
+<dt>
 -m
 </dt>
 <dd>
@@ -393,8 +427,8 @@ incremental SVN imports.</p>
 </p>
 <div class="literalblock">
 <div class="content">
-<pre><tt>Formerly, this option controlled how many revisions to pull, due to
-SVN memory leaks. (These have been worked around.)</tt></pre>
+<pre><tt>Formerly, this option controlled how many revisions to pull,
+due to SVN memory leaks. (These have been worked around.)</tt></pre>
 </div></div>
 </dd>
 <dt>
@@ -439,18 +473,13 @@ with a 40x error pretty quickly.</p>
 repository itself; it usually ends in "/svn".</p>
 </dd>
 <dt>
-&lt;SVN_repository_URL&gt;
+&lt;path&gt;
 </dt>
 <dd>
 <p>
-        The URL of the SVN module you want to import. For local
-        repositories, use "file:///absolute/path".
+        The path to the module you want to check out.
 </p>
 </dd>
-</dl>
-<p>&lt;path&gt;
-        The path to the module you want to check out.</p>
-<dl>
 <dt>
 -h
 </dt>
@@ -483,7 +512,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 06-Jan-2006 17:12:46 PDT
+Last updated 21-Mar-2006 08:33:43 UTC
 </div>
 </div>
 </body>
