Merge branch 'jc/test-sleepless'

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index d47f9ddd89e2b1057a58d43c591c5bd8c1d4b96f..ab4de103586e8382801dad7de2f43c57f4758e7e 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -33,7 +33,9 @@ OPTIONS
 
 -q::
 --quiet::
-       Pass --quiet to git-fetch and git-merge.
+       This is passed to both underlying git-fetch to squelch reporting of
+       during transfer, and underlying git-merge to squelch output during
+       merging.
 
 -v::
 --verbose::