Merge branch 'np/diff-in-corrupt-repository'

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 470ac31396606a18298f69329b050a86943c580c..678675ccdf06dbe0e97d80bb3fbc8985155d2fc0 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -36,7 +36,7 @@ ifndef::git-pull[]
 
 -p::
 --prune::
-       After fetching, remove any remote tracking branches which
+       After fetching, remove any remote-tracking branches which
        no longer exist on the remote.
 endif::git-pull[]
 
@@ -53,6 +53,7 @@ endif::git-pull[]
        behavior for a remote may be specified with the remote.<name>.tagopt
        setting. See linkgit:git-config[1].
 
+ifndef::git-pull[]
 -t::
 --tags::
        Most of the tags are fetched automatically as branch
@@ -63,6 +64,7 @@ endif::git-pull[]
        downloaded. The default behavior for a remote may be
        specified with the remote.<name>.tagopt setting. See
        linkgit:git-config[1].
+endif::git-pull[]
 
 -u::
 --update-head-ok::