diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-01-19 19:58:58 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-19 19:58:58 -0800 |
commit | b044c65855c79f627b002d77b5ed469bf3f0df0e (patch) | |
tree | 00a422918457d1bd3b5d1c1b4d82494e8bfeb25e /Documentation | |
parent | 20bf7292314972d4c418056ad94c28c6363058d7 (diff) | |
parent | 674a1d2628628aa21c32ef98279f99ba3794a640 (diff) | |
download | git-b044c65855c79f627b002d77b5ed469bf3f0df0e.tar.gz git-b044c65855c79f627b002d77b5ed469bf3f0df0e.tar.xz |
Merge branch 'maint'
* maint:
shell: Document that 'cvs server' is a valid command
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-shell.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.txt index ff420f8f8..3f8d973af 100644 --- a/Documentation/git-shell.txt +++ b/Documentation/git-shell.txt @@ -18,8 +18,9 @@ of server-side GIT commands implementing the pull/push functionality. The commands can be executed only by the '-c' option; the shell is not interactive. -Currently, only the 'git-receive-pack' and 'git-upload-pack' commands -are permitted to be called, with a single required argument. +Currently, only three commands are permitted to be called, 'git-receive-pack' +'git-upload-pack' with a single required argument or 'cvs server' (to invoke +'git-cvsserver'). Author ------ |