Merge branch 'jc/cherry'

diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index c75c86ea79ed73e7a9e451f3d003462d253385d6..fd6519299a9a089a1ffec544f55ba40775aedf9b 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
 -----------
@@ -30,9 +30,6 @@ OPTIONS
 \--timeout=<n>::
        Interrupt transfer after <n> seconds of inactivity.
 
-\--no-progress::
-       Do not show the progress.
-
 <directory>::
        The repository to sync from.