Merge branch 'maint'

* maint:
shell: Document that 'cvs server' is a valid command

diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.txt
index ff420f8f8c52eb598976a134916000da9b8f3976..3f8d973af1c9b8aead3f831eb94a42b2e461ec8b 100644 (file)
--- 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
 ------