Merge branch 'ak/apply-non-git-epoch'

[git.git] / Documentation / fetch-options.txt

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 9333c42c558464ce2430df39e9864f932e786b36..678675ccdf06dbe0e97d80bb3fbc8985155d2fc0 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -36,7 +36,7 @@ ifndef::git-pull[]
 
 -p::
 --prune::
 
 -p::
 --prune::

-       After fetching, remove any remote tracking branches which
+       After fetching, remove any remote-tracking branches which

        no longer exist on the remote.
 endif::git-pull[]
 
        no longer exist on the remote.
 endif::git-pull[]
 


@@ -49,8 +49,11 @@ 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.
 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].

 
 

+ifndef::git-pull[]

 -t::
 --tags::
        Most of the tags are fetched automatically as branch
 -t::
 --tags::
        Most of the tags are fetched automatically as branch


@@ -58,7 +61,10 @@ 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
        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].
+endif::git-pull[]

 
 -u::
 --update-head-ok::
 
 -u::
 --update-head-ok::