summaryrefslogtreecommitdiffstats
path: root/git-cvsimport.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
commitfce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch)
treeffce2ae419b52786a0e567f4fddaadd89016f62c /git-cvsimport.html
parentbb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff)
downloadgit-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-cvsimport.html')
-rw-r--r--git-cvsimport.html22
1 files changed, 11 insertions, 11 deletions
diff --git a/git-cvsimport.html b/git-cvsimport.html
index fd430d738..2de1108e8 100644
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -273,7 +273,7 @@ git-cvsimport(1) Manual Page
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-cvsimport</em> [-o &lt;branch-for-HEAD&gt;] [-h] [-v] [-d &lt;CVSROOT&gt;]
+<div class="content"><em>git cvsimport</em> [-o &lt;branch-for-HEAD&gt;] [-h] [-v] [-d &lt;CVSROOT&gt;]
[-A &lt;author-conv-file&gt;] [-p &lt;options-for-cvsps&gt;] [-P &lt;file&gt;]
[-C &lt;git_repository&gt;] [-z &lt;fuzz&gt;] [-i] [-k] [-u] [-s &lt;subst&gt;]
[-a] [-m] [-M &lt;regex&gt;] [-S &lt;regex&gt;] [-L &lt;commitlimit&gt;]
@@ -286,9 +286,9 @@ 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. By default initial import will create and populate a
+created by <tt>git-cvsimport</tt>. By default 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
+to work with; after that, you need to <tt>git-merge</tt> incremental imports, or
any CVS branches, yourself. It is advisable to specify a named remote via
-r to separate and protect the incoming branches.</p>
</div>
@@ -310,7 +310,7 @@ any CVS branches, yourself. It is advisable to specify a named remote via
<p>
The root of the CVS archive. May be local (a simple path) or remote;
currently, only the :local:, :ext: and :pserver: access methods
- are supported. If not given, git-cvsimport will try to read it
+ are supported. If not given, <tt>git-cvsimport</tt> will try to read it
from <tt>CVS/Root</tt>. If no such file exists, it checks for the
<tt>CVSROOT</tt> environment variable.
</p>
@@ -321,7 +321,7 @@ any CVS branches, yourself. It is advisable to specify a named remote via
<dd>
<p>
The CVS module you want to import. Relative to &lt;CVSROOT&gt;.
- If not given, git-cvsimport tries to read it from
+ If not given, <tt>git-cvsimport</tt> tries to read it from
<tt>CVS/Repository</tt>.
</p>
</dd>
@@ -341,7 +341,7 @@ any CVS branches, yourself. It is advisable to specify a named remote via
<p>
The git remote to import this CVS repository into.
Moves all CVS branches into remotes/&lt;remote&gt;/&lt;branch&gt;
- akin to the git-clone --use-separate-remote option.
+ akin to the <tt>git-clone</tt> "--use-separate-remote" option.
</p>
</dd>
<dt>
@@ -353,7 +353,7 @@ any CVS branches, yourself. It is advisable to specify a named remote via
from CVS is imported to the <em>origin</em> branch within the git
repository, as <em>HEAD</em> already has a special meaning for git.
When a remote is specified the <em>HEAD</em> branch is named
- remotes/&lt;remote&gt;/master mirroring git-clone behaviour.
+ remotes/&lt;remote&gt;/master mirroring <tt>git-clone</tt> behaviour.
Use this option if you want to import into a different
branch.
</p>
@@ -487,15 +487,15 @@ the old cvs2git tool.</p>
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><tt>git-cvsimport</tt> 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 <tt>$GIT_DIR/cvs-authors</tt>
each time the <em>-A</em> option is provided and read from that same
-file each time git-cvsimport is run.</p>
+file each time <tt>git-cvsimport</tt> is run.</p>
<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>
+<tt>git-cvsexportcommit</tt>.</p>
</dd>
<dt>
-h
@@ -528,7 +528,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:33:30 UTC
+Last updated 02-Jul-2008 03:01:38 UTC
</div>
</div>
</body>