summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-19 19:58:58 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-19 19:58:58 -0800
commitb044c65855c79f627b002d77b5ed469bf3f0df0e (patch)
tree00a422918457d1bd3b5d1c1b4d82494e8bfeb25e
parentbash completion: refactor diff options (diff)
parentshell: Document that 'cvs server' is a valid command (diff)
downloadtgif-b044c65855c79f627b002d77b5ed469bf3f0df0e.tar.xz
Merge branch 'maint'
* maint: shell: Document that 'cvs server' is a valid command
-rw-r--r--Documentation/git-shell.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.txt
index ff420f8f8c..3f8d973af1 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
------