Merge branch 'jc/deprecate-recursive'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 744c38dee3c1835bb5e0ace4834547e6113e3bda..2135b65516b372587a9a4fa13daf21df05a5d1ce 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -247,10 +247,6 @@ gitlink:git-upload-pack[1]::
        Invoked by 'git-fetch-pack' to push
        what are asked for.
 
-gitlink:git-upload-tar[1]::
-       Invoked by 'git-tar-tree --remote' to return the tar
-       archive the other end asked for.
-
 
 High-level commands (porcelain)
 -------------------------------
@@ -270,6 +266,9 @@ gitlink:git-am[1]::
 gitlink:git-applymbox[1]::
        Apply patches from a mailbox, original version by Linus.
 
+gitlink:git-archive[1]::
+       Creates an archive of files from a named tree.
+
 gitlink:git-bisect[1]::
        Find the change that introduced a bug by binary search.