<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
repository, or incrementally import into an existing one.</p>\r
<p>Splitting the CVS log into patch sets is done by <em>cvsps</em>.\r
At least version 2.1 is required.</p>\r
+<p>You should <strong>never</strong> do any work of your own on the branches that are\r
+created by git-cvsimport. The initial import will create and populate a\r
+"master" branch from the CVS repository's main branch which you're free\r
+to work with; after that, you need to <em>git merge</em> incremental imports, or\r
+any CVS branches, yourself.</p>\r
</div>\r
<h2>OPTIONS</h2>\r
<div class="sectionbody">\r
commit logs. Using this option and an author-conv-file\r
in this format\r
</p>\r
-<div class="literalblock">\r
+<div class="listingblock">\r
<div class="content">\r
-<pre><tt>exon=Andreas Ericsson <ae@op5.se>\r
-spawn=Simon Pawn <spawn@frog-pond.org></tt></pre>\r
+<pre><tt> exon=Andreas Ericsson <ae@op5.se>\r
+ spawn=Simon Pawn <spawn@frog-pond.org>\r
+</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
+<p>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
+all along.</p>\r
+<p>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
+file each time git-cvsimport is run.</p>\r
+<p>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
+git-link[1]::git-cvsexportcommit.</p>\r
</dd>\r
</dl>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 16-Jan-2006 00:23:09 PDT\r
+Last updated 21-Mar-2006 08:33:42 UTC\r
</div>\r
</div>\r
</body>\r