diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:02:35 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:02:35 -0800 |
commit | 03276d94bcdb7d463a029936933898948c0669ac (patch) | |
tree | 077f0623ee8fcfdb3e725d0b2b05b925390df51d /Documentation | |
parent | Merge branch 'kb/maint-submodule-savearg' (diff) | |
parent | pull: Remove --tags option from manpage (diff) | |
download | tgif-03276d94bcdb7d463a029936933898948c0669ac.tar.xz |
Merge branch 'jl/maint-pull-tags-doc'
* jl/maint-pull-tags-doc:
pull: Remove --tags option from manpage
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/fetch-options.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 470ac31396..5ce1e72745 100644 --- 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:: |