diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-01 20:52:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-01 20:52:10 (GMT) |
| commit | 6da28b4f87f80b560ae426e594640d61c437df14 (patch) | |
| tree | da166ec7a157a34681d1170990b53c88bbe8f35d /Documentation | |
| parent | e917918335e660629007f3d2d07d3d9a019b5273 (diff) | |
| parent | ed36854651303dd18156786fc096de611f43912c (diff) | |
| download | git-6da28b4f87f80b560ae426e594640d61c437df14.zip git-6da28b4f87f80b560ae426e594640d61c437df14.tar.gz git-6da28b4f87f80b560ae426e594640d61c437df14.tar.bz2 | |
Merge branch 'dj/fetch-tagopt' into maint
* dj/fetch-tagopt:
fetch: allow command line --tags to override config
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 4 | ||||
| -rw-r--r-- | Documentation/fetch-options.txt | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 7fffee7..dc4e83b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1629,7 +1629,9 @@ remote.<name>.tagopt:: Setting this value to \--no-tags disables automatic tag following when fetching from remote <name>. Setting it to \--tags will fetch every tag from remote <name>, even if they are not reachable from remote - branch heads. + branch heads. Passing these flags directly to linkgit:git-fetch[1] can + override this setting. See options \--tags and \--no-tags of + linkgit:git-fetch[1]. remote.<name>.vcs:: Setting this to a value <vcs> will cause git to interact with diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 9333c42..470ac31 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -49,7 +49,9 @@ ifndef::git-pull[] endif::git-pull[] By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. - This option disables this automatic tag following. + This option disables this automatic tag following. The default + behavior for a remote may be specified with the remote.<name>.tagopt + setting. See linkgit:git-config[1]. -t:: --tags:: @@ -58,7 +60,9 @@ endif::git-pull[] objects reachable from the branch heads that are being tracked will not be fetched by this mechanism. This flag lets all tags and their associated objects be - downloaded. + downloaded. The default behavior for a remote may be + specified with the remote.<name>.tagopt setting. See + linkgit:git-config[1]. -u:: --update-head-ok:: |