Merge branch 'maint-1.6.0' into maint

diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index c75c86ea79ed73e7a9e451f3d003462d253385d6..b8e49dce4a19a4d7083459468f27c273c1d91fea 100644 (file)
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -8,7 +8,7 @@ git-upload-pack - Send objects packed back to git-fetch-pack
 
 SYNOPSIS
 --------
-'git-upload-pack' [--strict] [--timeout=<n>] [--no-progress] <directory>
+'git upload-pack' [--strict] [--timeout=<n>] <directory>
 
 DESCRIPTION
 -----------
@@ -24,15 +24,12 @@ repository.  For push operations, see 'git-send-pack'.
 OPTIONS
 -------
 
-\--strict::
+--strict::
        Do not try <directory>/.git/ if <directory> is no git directory.
 
-\--timeout=<n>::
+--timeout=<n>::
        Interrupt transfer after <n> seconds of inactivity.
 
-\--no-progress::
-       Do not show the progress.
-
 <directory>::
        The repository to sync from.
 
@@ -46,4 +43,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite