Merge branch 'cb/maint-orphan-merge-noclobber' into maint

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 470ac31396606a18298f69329b050a86943c580c..5ce1e727458bfa5e73ad98c7a852bd7c0f034c6b 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -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::