diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-19 07:40:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-19 07:40:53 (GMT) |
| commit | c6670b348cb19c74a6d7f6943df4871eb0d8295f (patch) | |
| tree | efb4f9ff112962f11197fb8250261061f58bea39 /Documentation | |
| parent | 2ebc02d32a4360da2cf69c2b5f5bfad0716d42b0 (diff) | |
| parent | 26e08a0190cb3354e43bab13ea693a5c826a8fe1 (diff) | |
| download | git-c6670b348cb19c74a6d7f6943df4871eb0d8295f.zip git-c6670b348cb19c74a6d7f6943df4871eb0d8295f.tar.gz git-c6670b348cb19c74a6d7f6943df4871eb0d8295f.tar.bz2 | |
Merge branch 'maint'
* maint:
t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'
adapt git-cvsserver manpage to dash-free syntax
mailinfo: re-fix MIME multipart boundary parsing
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-cvsserver.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt index c2d3c90..785779e 100644 --- a/Documentation/git-cvsserver.txt +++ b/Documentation/git-cvsserver.txt @@ -11,7 +11,7 @@ SYNOPSIS SSH: [verse] -export CVS_SERVER=git-cvsserver +export CVS_SERVER="git cvsserver" 'cvs' -d :ext:user@server/path/repo.git co <HEAD_name> pserver (/etc/inetd.conf): @@ -109,7 +109,7 @@ Note: Newer CVS versions (>= 1.12.11) also support specifying CVS_SERVER directly in CVSROOT like ------ -cvs -d ":ext;CVS_SERVER=git-cvsserver:user@server/path/repo.git" co <HEAD_name> +cvs -d ":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git" co <HEAD_name> ------ This has the advantage that it will be saved in your 'CVS/Root' files and you don't need to worry about always setting the correct environment @@ -158,7 +158,7 @@ allowing access over SSH. -- ------ export CVSROOT=:ext:user@server:/var/git/project.git - export CVS_SERVER=git-cvsserver + export CVS_SERVER="git cvsserver" ------ -- 4. For SSH clients that will make commits, make sure their server-side @@ -283,7 +283,7 @@ To get a checkout with the Eclipse CVS client: Protocol notes: If you are using anonymous access via pserver, just select that. Those using SSH access should choose the 'ext' protocol, and configure 'ext' access on the Preferences->Team->CVS->ExtConnection pane. Set CVS_SERVER to -'git-cvsserver'. Note that password support is not good when using 'ext', +"'git cvsserver'". Note that password support is not good when using 'ext', you will definitely want to have SSH keys setup. Alternatively, you can just use the non-standard extssh protocol that Eclipse |