Merge branch 'maint-1.5.1' into maint

diff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt
index 234882685d923d632c4e09a38cb9ba18439dda4a..310033e4605d20b99c21a769e79b25b64abbb618 100644 (file)
--- a/Documentation/git-prune-packed.txt
+++ b/Documentation/git-prune-packed.txt
@@ -3,13 +3,12 @@ git-prune-packed(1)
 
 NAME
 ----
-git-prune-packed - Program used to remove the extra object files that are now
-residing in a pack file.
+git-prune-packed - Remove extra objects that are already in pack files
 
 
 SYNOPSIS
 --------
-'git-prune-packed' [-n]
+'git-prune-packed' [-n] [-q]
 
 
 DESCRIPTION
@@ -32,6 +31,9 @@ OPTIONS
         Don't actually remove any objects, only show those that would have been
         removed.
 
+-q::
+       Squelch the progress indicator.
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>