t/t4018: avoid two unnecessary sub-shell invocations

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

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 044ec882ccf9f8437862a5e59a3caee7030c36ae..470ac31396606a18298f69329b050a86943c580c 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -34,6 +34,7 @@ ifndef::git-pull[]
        Allow several <repository> and <group> arguments to be
        specified. No <refspec>s may be specified.
 
        Allow several <repository> and <group> arguments to be
        specified. No <refspec>s may be specified.
 

+-p::

 --prune::
        After fetching, remove any remote tracking branches which
        no longer exist on the remote.
 --prune::
        After fetching, remove any remote tracking branches which
        no longer exist on the remote.


@@ -48,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.
 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::
 
 -t::
 --tags::


@@ -57,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
        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::
 
 -u::
 --update-head-ok::