diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:24:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-31 16:24:24 -0700 |
| commit | 381b2e76985de1c3670ec3c1938fef679c6eef17 (patch) | |
| tree | d411abec9022feeead621d3e644681b194c53413 /Documentation | |
| parent | 3f29dd6c2344c56aad263a82a773ead0d9fded30 (diff) | |
| parent | ed36854651303dd18156786fc096de611f43912c (diff) | |
| download | git-381b2e76985de1c3670ec3c1938fef679c6eef17.tar.gz | |
Merge branch 'dj/fetch-tagopt'
* 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 19b6dc6dda..61831f60ce 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1646,7 +1646,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 9333c42c55..470ac31396 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:: |