Autogenerated HTML docs for v1.3.1-g7464

[git.git] / git-svnimport.html

diff --git a/git-svnimport.html b/git-svnimport.html
index dcce0fa..ea04c0f 100644 (file)
--- a/git-svnimport.html
+++ b/git-svnimport.html
@@ -272,11 +272,13 @@ git-svnimport(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-svnimport</em> [ -o &lt;branch-for-HEAD&gt; ] [ -h ] [ -v ] [ -d | -D ]\r
-                        [ -C &lt;GIT_repository&gt; ] [ -i ] [ -u ] [-l limit_rev]\r
-                        [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ]\r
-                        [ -s start_chg ] [ -m ] [ -M regex ]\r
-                        &lt;SVN_repository_URL&gt; [ &lt;path&gt; ]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-svnimport</em> [ -o &lt;branch-for-HEAD&gt; ] [ -h ] [ -v ] [ -d | -D ]\r
+                [ -C &lt;GIT_repository&gt; ] [ -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; ] [ -A &lt;author_file&gt; ]\r
+                &lt;SVN_repository_URL&gt; [ &lt;path&gt; ]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -365,6 +367,38 @@ incremental SVN imports.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-I &lt;ignorefile_name&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Import the svn:ignore directory property to files with this\r
+        name in each directory. (The Subversion and GIT ignore\r
+        syntaxes are similar enough that using the Subversion patterns\r
+        directly with "-I .gitignore" will almost always just work.)\r
+</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="listingblock">\r
+<div class="content">\r
+<pre><tt>        username = User's Full Name &lt;email@addr.es&gt;\r
+</tt></pre>\r
+</div></div>\r
+<p>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.</p>\r
+<p>For convenience, this data is saved to $GIT_DIR/svn-authors\r
+each time the -A option is provided, and read from that same\r
+file each time git-svnimport is run with an existing GIT\r
+repository without -A.</p>\r
+</dd>\r
+<dt>\r
 -m\r
 </dt>\r
 <dd>\r
@@ -478,7 +512,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 15-Feb-2006 02:21:51 UTC\r
+Last updated 21-Mar-2006 08:33:43 UTC\r
 </div>\r
 </div>\r
 </body>\r