Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt
index 234882685d923d632c4e09a38cb9ba18439dda4a..a79193fb007bcaa8dc47b2763e4167a6f31a3dff 100644 (file)
--- a/Documentation/git-prune-packed.txt
+++ b/Documentation/git-prune-packed.txt
@@ -9,7 +9,7 @@ residing in a pack file.
 
 SYNOPSIS
 --------
-'git-prune-packed' [-n]
+'git-prune-packed' [-n] [-q]
 
 
 DESCRIPTION
@@ -32,6 +32,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>