diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
| commit | 1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch) | |
| tree | 72812d480799e16b94f9cfed423b8d7d45c7fb4f /git-cvsserver.html | |
| parent | a9701f0184382d8de7380c56558718915905746a (diff) | |
| download | git-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz | |
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'git-cvsserver.html')
| -rw-r--r-- | git-cvsserver.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-cvsserver.html b/git-cvsserver.html index e5aabc38c..6b03a4a50 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -329,7 +329,7 @@ git-cvsserver(1) Manual Page <div class="content">cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver</div></div>
<div class="para"><p>Usage:</p></div>
<div class="verseblock">
-<div class="content"><em>git cvsserver</em> [options] [pserver|server] [<directory> …]</div></div>
+<div class="content"><em>git-cvsserver</em> [options] [pserver|server] [<directory> …]</div></div>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
@@ -548,7 +548,7 @@ them write access to the directory, too.</p></div> <div class="para"><p>The database can not be reliably regenerated in a
consistent form after the branch it is tracking has changed.
Example: For merged branches, <em>git-cvsserver</em> only tracks
-one branch of development, and after a <em>git-merge</em> an
+one branch of development, and after a <em>git merge</em> an
incrementally updated database may track a different branch
than a database regenerated from scratch, causing inconsistent
CVS revision numbers. <tt>git-cvsserver</tt> has no way of knowing which
@@ -713,7 +713,7 @@ Pick <em>HEAD</em> when it asks what branch/tag to check out. Untick the <div class="para"><p>Protocol notes: If you are using anonymous access via pserver, just select that.
Those using SSH access should choose the <em>ext</em> protocol, and configure <em>ext</em>
access on the Preferences->Team->CVS->ExtConnection pane. Set CVS_SERVER to
-"<em>git cvsserver</em>". Note that password support is not good when using <em>ext</em>,
+"<tt>git cvsserver</tt>". Note that password support is not good when using <em>ext</em>,
you will definitely want to have SSH keys setup.</p></div>
<div class="para"><p>Alternatively, you can just use the non-standard extssh protocol that Eclipse
offer. In that case CVS_SERVER is ignored, and you will have to replace
@@ -806,7 +806,7 @@ Martin Langhoff <martin@catalyst.net.nz> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-01-10 19:52:58 UTC
+Last updated 2010-01-21 17:44:25 UTC
</div>
</div>
</body>
|