Merge branch 'jk/maint-sha1-file-name-fix'

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 31f42ea21a249abfa1ab2e220a077fee30d3d5e4..ab4de103586e8382801dad7de2f43c57f4758e7e 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -31,6 +31,16 @@ in a state that is hard to back out of in the case of a conflict.
 OPTIONS
 -------
 
+-q::
+--quiet::
+       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::
+       Pass --verbose to git-fetch and git-merge.
+
 Options related to merging
 ~~~~~~~~~~~~~~~~~~~~~~~~~~