X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-cvsimport.html;h=dcae53b7b2ecc97c5ba8ff7fd1dffdb6a608f4d1;hb=6959c6c419acf390c79b816b7117da3cac54db71;hp=b3974f9af9b9ff07bb02d50f27eff3e5781bbb1b;hpb=1a4e841b439ba014b365999c3a6b9e2be3740bd8;p=git.git

diff --git a/git-cvsimport.html b/git-cvsimport.html
index b3974f9a..dcae53b7 100644
--- a/git-cvsimport.html
+++ b/git-cvsimport.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,10 +272,10 @@ git-cvsimport(1) Manual Page
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-cvsimport</em> [ -o &lt;branch-for-HEAD&gt; ] [ -h ] [ -v ]
-                        [ -d &lt;CVSROOT&gt; ] [ -p &lt;options-for-cvsps&gt; ]
-                        [ -C &lt;git_repository&gt; ] [ -i ] [ -P &lt;file&gt; ] [ -k ]
-                        [ -s &lt;subst&gt; ] [ -m ] [ -M regex ] [ &lt;CVS_module&gt; ]</p>
+<div class="verseblock">
+<div class="content"><em>git-cvsimport</em> [-o &lt;branch-for-HEAD&gt;] [-h] [-v] [-d &lt;CVSROOT&gt;] [-s &lt;subst&gt;]
+              [-p &lt;options-for-cvsps&gt;] [-C &lt;git_repository&gt;] [-i] [-P &lt;file&gt;]
+              [-m] [-M regex] [&lt;CVS_module&gt;]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -283,6 +283,11 @@ git-cvsimport(1) Manual Page
 repository, or incrementally import into an existing one.</p>
 <p>Splitting the CVS log into patch sets is done by <em>cvsps</em>.
 At least version 2.1 is required.</p>
+<p>You should <strong>never</strong> do any work of your own on the branches that are
+created by git-cvsimport. The initial import will create and populate a
+"master" branch from the CVS repository's main branch which you're free
+to work with; after that, you need to <em>git merge</em> incremental imports, or
+any CVS branches, yourself.</p>
 </div>
 <h2>OPTIONS</h2>
 <div class="sectionbody">
@@ -425,6 +430,31 @@ the old cvs2git tool.</p>
         Substitute the character "/" in branch names with &lt;subst&gt;
 </p>
 </dd>
+<dt>
+-A &lt;author-conv-file&gt;
+</dt>
+<dd>
+<p>
+        CVS by default uses the unix username when writing its
+        commit logs. Using this option and an author-conv-file
+        in this format
+</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>        exon=Andreas Ericsson &lt;ae@op5.se&gt;
+        spawn=Simon Pawn &lt;spawn@frog-pond.org&gt;
+</tt></pre>
+</div></div>
+<p>git-cvsimport will make it appear as those authors had
+their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
+all along.</p>
+<p>For convenience, this data is saved to $GIT_DIR/cvs-authors
+each time the -A option is provided and read from that same
+file each time git-cvsimport is run.</p>
+<p>It is not recommended to use this feature if you intend to
+export changes back to CVS again later with
+git-link[1]::git-cvsexportcommit.</p>
+</dd>
 </dl>
 </div>
 <h2>OUTPUT</h2>
@@ -448,7 +478,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-Dec-2005 00:15:58 PDT
+Last updated 21-Mar-2006 08:33:42 UTC
 </div>
 </div>
 </body>
