Merge branch 'master' into jc/web

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 2135b65516b372587a9a4fa13daf21df05a5d1ce..3af6fc63e2b5fa4d21e54a76a2a18bf7c47ab1c2 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -243,6 +243,9 @@ gitlink:git-update-server-info[1]::
        Updates auxiliary information on a dumb server to help
        clients discover references and packs on it.
 
+gitlink:git-upload-archive[1]::
+       Invoked by 'git-archive' to send a generated archive.
+
 gitlink:git-upload-pack[1]::
        Invoked by 'git-fetch-pack' to push
        what are asked for.