Imported Upstream version 2.0.1

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

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 6e98bdf..92c68c3 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -8,11 +8,25 @@
        option old data in `.git/FETCH_HEAD` will be overwritten.
 
 --depth=<depth>::
        option old data in `.git/FETCH_HEAD` will be overwritten.
 
 --depth=<depth>::

-       Deepen the history of a 'shallow' repository created by
+       Deepen or shorten the history of a 'shallow' repository created by

        `git clone` with `--depth=<depth>` option (see linkgit:git-clone[1])
        to the specified number of commits from the tip of each remote
        branch history. Tags for the deepened commits are not fetched.
 
        `git clone` with `--depth=<depth>` option (see linkgit:git-clone[1])
        to the specified number of commits from the tip of each remote
        branch history. Tags for the deepened commits are not fetched.
 

+--unshallow::
+       If the source repository is complete, convert a shallow
+       repository to a complete one, removing all the limitations
+       imposed by shallow repositories.
++
+If the source repository is shallow, fetch as much as possible so that
+the current repository has the same history as the source repository.
+
+--update-shallow::
+       By default when fetching from a shallow repository,
+       `git fetch` refuses refs that require updating
+       .git/shallow. This option updates .git/shallow and accept such
+       refs.
+

 ifndef::git-pull[]
 --dry-run::
        Show what would be done, without making any changes.
 ifndef::git-pull[]
 --dry-run::
        Show what would be done, without making any changes.


@@ -37,17 +51,20 @@ ifndef::git-pull[]
 
 -p::
 --prune::
 
 -p::
 --prune::

-       After fetching, remove any remote-tracking branches which
-       no longer exist on the remote.
+       After fetching, remove any remote-tracking references that no
+       longer exist on the remote.  Tags are not subject to pruning
+       if they are fetched only because of the default tag
+       auto-following or due to a --tags option.  However, if tags
+       are fetched due to an explicit refspec (either on the command
+       line or in the remote configuration, for example if the remote
+       was cloned with the --mirror option), then they are also
+       subject to pruning.

 endif::git-pull[]
 
 endif::git-pull[]
 

-ifdef::git-pull[]
---no-tags::
-endif::git-pull[]

 ifndef::git-pull[]
 -n::
 ifndef::git-pull[]
 -n::

---no-tags::

 endif::git-pull[]
 endif::git-pull[]

+--no-tags::

        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. The default
        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. The default


@@ -57,11 +74,12 @@ endif::git-pull[]
 ifndef::git-pull[]
 -t::
 --tags::
 ifndef::git-pull[]
 -t::
 --tags::

-       This is a short-hand for giving "refs/tags/*:refs/tags/*"
-       refspec from the command line, to ask all tags to be fetched
-       and stored locally.  Because this acts as an explicit
-       refspec, the default refspecs (configured with the
-       remote.$name.fetch variable) are overridden and not used.
+       Fetch all tags from the remote (i.e., fetch remote tags
+       `refs/tags/*` into local tags with the same name), in addition
+       to whatever else would otherwise be fetched.  Using this
+       option alone does not subject tags to pruning, even if --prune
+       is used (though tags may be pruned anyway if they are also the
+       destination of an explicit refspec; see '--prune').

 
 --recurse-submodules[=yes|on-demand|no]::
        This option controls if and under what conditions new commits of
 
 --recurse-submodules[=yes|on-demand|no]::
        This option controls if and under what conditions new commits of