Merge branch 'wp/merge-tree-fix'

[git.git] / Documentation / git-upload-archive.txt

diff --git a/Documentation/git-upload-archive.txt b/Documentation/git-upload-archive.txt
index 403871d7c6d0e8886cc61d60062d172d4fbda825..f5f2b3908b2a1550f44ad6615d9335d40e264112 100644 (file)
--- a/Documentation/git-upload-archive.txt
+++ b/Documentation/git-upload-archive.txt
@@ -8,15 +8,15 @@ git-upload-archive - Send archive back to git-archive
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-upload-archive' <directory>
+'git upload-archive' <directory>

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

-Invoked by 'git-archive --remote' and sends a generated archive to the
+Invoked by 'git archive --remote' and sends a generated archive to the

 other end over the git protocol.
 
 This command is usually not invoked directly by the end user.  The UI
 other end over the git protocol.
 
 This command is usually not invoked directly by the end user.  The UI

-for the protocol is on the 'git-archive' side, and the program pair
+for the protocol is on the 'git archive' side, and the program pair

 is meant to be used to get an archive from a remote repository.
 
 OPTIONS
 is meant to be used to get an archive from a remote repository.
 
 OPTIONS


@@ -34,4 +34,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
 
 GIT
 ---

-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite