Autogenerated HTML docs for v1.1.2-g4230

1 files changed, 34 insertions, 1 deletions

diff --git a/git-cvsimport.html b/git-cvsimport.html
index 20f90f062..9295c054d 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>