Merge branch 'maint-1.6.4' into maint

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index ea3b1bc19f753ca80bc133ae614d2c79810a1cb0..5eb2b0ee07b2f4e81e909a103f486c1a6d2dc6cb 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -1,3 +1,4 @@
+ifndef::git-pull[]
 -q::
 --quiet::
        Pass --quiet to git-fetch-pack and silence any other internally
@@ -6,6 +7,7 @@
 -v::
 --verbose::
        Be verbose.
+endif::git-pull[]
 
 -a::
 --append::