Autogenerated HTML docs for v1.2.4-gec57

[git.git] / git-cvsimport.html

diff --git a/git-cvsimport.html b/git-cvsimport.html
index b3974f9..9295c05 100644 (file)
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -272,10 +272,10 @@ git-cvsimport(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-cvsimport</em> [ -o &lt;branch-for-HEAD&gt; ] [ -h ] [ -v ]\r
-                        [ -d &lt;CVSROOT&gt; ] [ -p &lt;options-for-cvsps&gt; ]\r
-                        [ -C &lt;git_repository&gt; ] [ -i ] [ -P &lt;file&gt; ] [ -k ]\r
-                        [ -s &lt;subst&gt; ] [ -m ] [ -M regex ] [ &lt;CVS_module&gt; ]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-cvsimport</em> [-o &lt;branch-for-HEAD&gt;] [-h] [-v] [-d &lt;CVSROOT&gt;] [-s &lt;subst&gt;]\r
+              [-p &lt;options-for-cvsps&gt;] [-C &lt;git_repository&gt;] [-i] [-P &lt;file&gt;]\r
+              [-m] [-M regex] [&lt;CVS_module&gt;]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -425,6 +425,39 @@ the old cvs2git tool.</p>
         Substitute the character "/" in branch names with &lt;subst&gt;\r
 </p>\r
 </dd>\r
+<dt>\r
+-A &lt;author-conv-file&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        CVS by default uses the unix username when writing its\r
+        commit logs. Using this option and an author-conv-file\r
+        in this format\r
+</p>\r
+<div class="literalblock">\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;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>git-cvsimport will make it appear as those authors had\r
+their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly\r
+all along.</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>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.</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>It is not recommended to use this feature if you intend to\r
+export changes back to CVS again later with\r
+git-link[1]::git-cvsexportcommit.</tt></pre>\r
+</div></div>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>OUTPUT</h2>\r
@@ -448,7 +481,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-Dec-2005 00:15:58 PDT\r
+Last updated 16-Jan-2006 00:23:09 PDT\r
 </div>\r
 </div>\r
 </body>\r