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 e49f68f68e490d7230963eec06b91ab09c34e19a..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