Merge branch 'maint'

diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 6feebc0400b86407a118840d9a6cc994a94715d6..b051ccb6d6d47d7fdb41ba27e3e42c82a4460608 100644 (file)
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -47,6 +47,10 @@ OPTIONS
        the paths only from the index, leaving working tree
        files.
 
+\--quiet::
+       git-rm normally outputs one line (in the form of an "rm" command)
+       for each file removed. This option suppresses that output.
+
 
 DISCUSSION
 ----------