Autogenerated HTML docs for v1.4.4.4-g4083

diff --git a/git-cvsimport.html b/git-cvsimport.html
index 182f6db7a08e5d03b571f54bf85eb0fc77db4276..4e4f8cb87611775972d47b72c542b335a82c239a 100644 (file)
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -419,7 +419,8 @@ the old cvs2git tool.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Pass the timestamp fuzz factor to cvsps.\r
+        Pass the timestamp fuzz factor to cvsps, in seconds. If unset,\r
+        cvsps defaults to 300s.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -439,23 +440,53 @@ the old cvs2git tool.</p>
         commit logs. Using this option and an author-conv-file\r
         in this format\r
 </p>\r
+</dd>\r
+<dt>\r
+-a\r
+</dt>\r
+<dd>\r
+<p>\r
+        Import all commits, including recent ones. cvsimport by default\r
+        skips commits that have a timestamp less than 10 minutes ago.\r
+</p>\r
+</dd>\r
+<dt>\r
+-S &lt;regex&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Skip paths matching the regex.\r
+</p>\r
+</dd>\r
+<dt>\r
+-L &lt;limit&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Limit the number of commits imported. Workaround for cases where\r
+        cvsimport leaks memory.\r
+</p>\r
+</dd>\r
+</dl>\r
+<p>+</p>\r
 <div class="listingblock">\r
 <div class="content">\r
 <pre><tt>        exon=Andreas Ericsson &lt;ae@op5.se&gt;\r
         spawn=Simon Pawn &lt;spawn@frog-pond.org&gt;\r
 </tt></pre>\r
 </div></div>\r
-<p>git-cvsimport will make it appear as those authors had\r
+<p>+\r
+git-cvsimport will make it appear as those authors had\r
 their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly\r
 all along.</p>\r
-<p>For convenience, this data is saved to $GIT_DIR/cvs-authors\r
+<p>+\r
+For convenience, this data is saved to $GIT_DIR/cvs-authors\r
 each time the -A option is provided and read from that same\r
 file each time git-cvsimport is run.</p>\r
-<p>It is not recommended to use this feature if you intend to\r
+<p>+\r
+It is not recommended to use this feature if you intend to\r
 export changes back to CVS again later with\r
 <a href="git-cvsexportcommit.html">git-cvsexportcommit(1)</a>.</p>\r
-</dd>\r
-</dl>\r
 </div>\r
 <h2>OUTPUT</h2>\r
 <div class="sectionbody">\r
@@ -478,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 03-Oct-2006 08:40:59 UTC\r
+Last updated 08-Jan-2007 11:18:44 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsimport.txt b/git-cvsimport.txt
index d21d66bfebe368c034afdabf79e8f143813e619d..5c402de2675024c9286e2ee72506cb1d0a56fc31 100644 (file)
--- a/git-cvsimport.txt
+++ b/git-cvsimport.txt
@@ -90,7 +90,8 @@ If you need to pass multiple options, separate them with a comma.
        Print a short usage message and exit.
 
 -z <fuzz>::
-        Pass the timestamp fuzz factor to cvsps.
+       Pass the timestamp fuzz factor to cvsps, in seconds. If unset,
+       cvsps defaults to 300s.
 
 -s <subst>::
        Substitute the character "/" in branch names with <subst>
@@ -99,6 +100,18 @@ If you need to pass multiple options, separate them with a comma.
        CVS by default uses the unix username when writing its
        commit logs. Using this option and an author-conv-file
        in this format
+
+-a::
+       Import all commits, including recent ones. cvsimport by default
+       skips commits that have a timestamp less than 10 minutes ago.
+
+-S <regex>::
+       Skip paths matching the regex.
+
+-L <limit>::
+       Limit the number of commits imported. Workaround for cases where
+       cvsimport leaks memory.
+
 +
 ---------
        exon=Andreas Ericsson <ae@op5.se>