merge-recursive: Move rename/delete handling into dedicated function

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