diff options
| author | Daniel Johnson <computerdruid@gmail.com> | 2010-08-11 18:57:20 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-14 19:24:23 -0700 |
| commit | ed36854651303dd18156786fc096de611f43912c (patch) | |
| tree | 328e1ac5bedad23c32390e7e45199702040ff090 /Documentation | |
| parent | 64fdc08dac6694d1e754580e7acb82dfa4988bb9 (diff) | |
| download | git-ed36854651303dd18156786fc096de611f43912c.tar.gz git-ed36854651303dd18156786fc096de611f43912c.tar.xz | |
fetch: allow command line --tags to override config
Originally, if remote.<name>.tagopt was set, the --tags and option would
have no effect when given to git fetch. So if
tagopt="--no-tags"
git fetch --tags
would not actually fetch tags.
This patch changes this behavior to only follow what is written in the
config if there is no option passed by the command line.
Signed-off-by: Daniel Johnson <ComputerDruid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 e75434b3e..297101f1a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1623,7 +1623,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 9333c42c5..470ac3139 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:: |