aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-01 13:52:10 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-01 13:52:10 -0700
commit6da28b4f87f80b560ae426e594640d61c437df14 (patch)
treeda166ec7a157a34681d1170990b53c88bbe8f35d /Documentation/config.txt
parente917918335e660629007f3d2d07d3d9a019b5273 (diff)
parented36854651303dd18156786fc096de611f43912c (diff)
downloadgit-6da28b4f87f80b560ae426e594640d61c437df14.tar.gz
git-6da28b4f87f80b560ae426e594640d61c437df14.tar.xz
Merge branch 'dj/fetch-tagopt' into maint
* 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 7fffee7e3..dc4e83b10 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