diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-24 20:47:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 20:47:42 (GMT) |
| commit | 16529f2e5630d3d155e4dff0ebd3c7c5daa882f9 (patch) | |
| tree | 57c2706576d98a6610b577c4b44b5e349b50fdc2 /Documentation | |
| parent | 4713fd9b5d472f94fc6f821ae8581d27da4e8094 (diff) | |
| parent | 2e5955f328a0787c08c69ffb584e8021bb5be818 (diff) | |
| download | git-16529f2e5630d3d155e4dff0ebd3c7c5daa882f9.zip git-16529f2e5630d3d155e4dff0ebd3c7c5daa882f9.tar.gz git-16529f2e5630d3d155e4dff0ebd3c7c5daa882f9.tar.bz2 | |
Merge branch 'jl/maint-pull-tags-doc' into maint
* 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 470ac31..5ce1e72 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:: |