Merge branch 'gfi-maint' into maint

diff --git a/Documentation/git-upload-archive.txt b/Documentation/git-upload-archive.txt
index 388bb53d297d559d21b2c9edb8c46c0e987c6b88..403871d7c6d0e8886cc61d60062d172d4fbda825 100644 (file)
--- a/Documentation/git-upload-archive.txt
+++ b/Documentation/git-upload-archive.txt
@@ -3,7 +3,7 @@ git-upload-archive(1)
 
 NAME
 ----
-git-upload-archive - Send archive
+git-upload-archive - Send archive back to git-archive
 
 
 SYNOPSIS