summaryrefslogtreecommitdiffstats
path: root/git-cvsimport.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-02-28 08:13:52 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-02-28 08:13:52 +0000
commitdb911ee731950adff42ed5f6bec37c095e6f16a3 (patch)
tree83cae002c7b96d245b0db65b27cf5b6402b2cc14 /git-cvsimport.html
parent17dde0e423f4710264b28df4670ce94847970f64 (diff)
downloadgit-htmldocs-db911ee731950adff42ed5f6bec37c095e6f16a3.tar.gz
Autogenerated HTML docs for v1.5.0.2-230-gfbe3d
Diffstat (limited to 'git-cvsimport.html')
-rw-r--r--git-cvsimport.html34
1 files changed, 15 insertions, 19 deletions
diff --git a/git-cvsimport.html b/git-cvsimport.html
index 6cb109f91..508da8853 100644
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -432,16 +432,6 @@ the old cvs2git tool.</p>
</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>
-</dd>
-<dt>
-a
</dt>
<dd>
@@ -467,26 +457,32 @@ the old cvs2git tool.</p>
cvsimport leaks memory.
</p>
</dd>
-</dl>
-<p>+</p>
+<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
+<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
+<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
+<p>It is not recommended to use this feature if you intend to
export changes back to CVS again later with
<a href="git-cvsexportcommit.html">git-cvsexportcommit(1)</a>.</p>
+</dd>
+</dl>
</div>
<h2>OUTPUT</h2>
<div class="sectionbody">
@@ -509,7 +505,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 19-Jan-2007 00:37:17 UTC
+Last updated 28-Feb-2007 08:13:31 UTC
</div>
</div>
</body>