aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-17 21:42:12 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-17 21:42:12 -0700
commitef5542ca93ea6751c97104ca13f79b3d4d2d2ca8 (patch)
tree2a03b5d2ee55e2e6e95f850bccef169f799b0c59 /Documentation
parent1dd9b638c1c46f1bd71cf48bad2cdf78d54cd858 (diff)
parent79f72b97633d1699f131e798bb9833339ba22f6a (diff)
downloadgit-ef5542ca93ea6751c97104ca13f79b3d4d2d2ca8.tar.gz
git-ef5542ca93ea6751c97104ca13f79b3d4d2d2ca8.tar.xz
Merge branch 'eb/upload-archive-from-git-shell'
* eb/upload-archive-from-git-shell: git-shell: Add 'git-upload-archive' to allowed commands.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-shell.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.txt
index 3f8d973af..0f3ad811c 100644
--- a/Documentation/git-shell.txt
+++ b/Documentation/git-shell.txt
@@ -18,9 +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 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').
+Currently, only four commands are permitted to be called, 'git-receive-pack'
+'git-upload-pack' and 'git-upload-archive' with a single required argument, or
+'cvs server' (to invoke 'git-cvsserver').
Author
------