Merge branch 'jl/maint-pull-tags-doc' into maint

* jl/maint-pull-tags-doc: pull: Remove --tags option from manpage
git-mirror · Nov 24, 2010 · 16529f2 · 16529f2
2 parents 4713fd9 + 2e5955f
commit 16529f2
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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::