aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-31 16:24:24 -0700
committerJunio C Hamano <gitster@pobox.com>2010-08-31 16:24:24 -0700
commit381b2e76985de1c3670ec3c1938fef679c6eef17 (patch)
treed411abec9022feeead621d3e644681b194c53413 /Documentation/config.txt
parent3f29dd6c2344c56aad263a82a773ead0d9fded30 (diff)
parented36854651303dd18156786fc096de611f43912c (diff)
downloadgit-381b2e76985de1c3670ec3c1938fef679c6eef17.tar.gz
git-381b2e76985de1c3670ec3c1938fef679c6eef17.tar.xz
Merge branch 'dj/fetch-tagopt'
* dj/fetch-tagopt: fetch: allow command line --tags to override config
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 19b6dc6dd..61831f60c 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