Merge branch 'maint-1.6.4' into maint

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 85c87180db59906f5401eafbe6460f49a60ee9dc..5eb2b0ee07b2f4e81e909a103f486c1a6d2dc6cb 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -1,11 +1,13 @@
+ifndef::git-pull[]
 -q::
 --quiet::
        Pass --quiet to git-fetch-pack and silence any other internally
-       used programs.
+       used git commands.
 
 -v::
 --verbose::
        Be verbose.
+endif::git-pull[]
 
 -a::
 --append::
@@ -21,7 +23,7 @@
 
 -f::
 --force::
-       When `git-fetch` is used with `<rbranch>:<lbranch>`
+       When 'git-fetch' is used with `<rbranch>:<lbranch>`
        refspec, it refuses to update the local branch
        `<lbranch>` unless the remote branch `<rbranch>` it
        fetches is a descendant of `<lbranch>`.  This option
@@ -53,10 +55,10 @@ endif::git-pull[]
 
 -u::
 --update-head-ok::
-       By default `git-fetch` refuses to update the head which
+       By default 'git-fetch' refuses to update the head which
        corresponds to the current branch.  This flag disables the
-       check.  This is purely for the internal use for `git-pull`
-       to communicate with `git-fetch`, and unless you are
+       check.  This is purely for the internal use for 'git-pull'
+       to communicate with 'git-fetch', and unless you are
        implementing your own Porcelain you are not supposed to
        use it.