X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-cvsimport.html;h=9295c054dd4b57d18db377c5292ebbca1db6e5bd;hb=5f32776d3bc48bfda61e2d0586d920bc3baf4b16;hp=20f90f0628cca0a05e307905835e845ed3beb44f;hpb=235a91e6b0d1d18a2517cf7e0a18278a6912bdb0;p=git.git

diff --git a/git-cvsimport.html b/git-cvsimport.html
index 20f90f06..9295c054 100644
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -425,6 +425,39 @@ 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="literalblock">
+<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>
+<div class="literalblock">
+<div class="content">
+<pre><tt>git-cvsimport will make it appear as those authors had
+their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly
+all along.</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>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.</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>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.</tt></pre>
+</div></div>
+</dd>
 </dl>
 </div>
 <h2>OUTPUT</h2>
@@ -448,7 +481,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:15 PDT
+Last updated 16-Jan-2006 00:23:09 PDT
 </div>
 </div>
 </body>