Merge branch 'jk/fetch-prune-doc'

* jk/fetch-prune-doc:
fetch: document that pruning happens before fetching

diff --combined Documentation/fetch-options.txt
index 036edfb099c367262f34d2c1275ac5079a1e0914,dfbc8ad0dfbcf9a01cf6f902d007c08d8934541a..b05a8341e82f7ff3a1e07a0f6b691292cc9c5e68
--- 1/Documentation/fetch-options.txt
--- 2/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@@ -8,11 -8,10 +8,11 @@@
        option old data in `.git/FETCH_HEAD` will be overwritten.
  
  --depth=<depth>::
 -      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.
 +      Limit fetching to the specified number of commits from the tip of
 +      each remote branch history. If fetching to a 'shallow' repository
 +      created by `git clone` with `--depth=<depth>` option (see
 +      linkgit:git-clone[1]), deepen or shorten the history to the specified
 +      number of commits. Tags for the deepened commits are not fetched.
  
  --unshallow::
        If the source repository is complete, convert a shallow
@@@ -52,7 -51,7 +52,7 @@@ ifndef::git-pull[
  
  -p::
  --prune::
-       After fetching, remove any remote-tracking references that no
+       Before 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
@@@ -101,13 -100,6 +101,13 @@@ ifndef::git-pull[
        reference to a commit that isn't already in the local submodule
        clone.
  
 +-j::
 +--jobs=<n>::
 +      Number of parallel children to be used for fetching submodules.
 +      Each will fetch from different submodules, such that fetching many
 +      submodules will be faster. By default submodules will be fetched
 +      one at a time.
 +
  --no-recurse-submodules::
        Disable recursive fetching of submodules (this has the same effect as
        using the '--recurse-submodules=no' option).
@@@ -158,11 -150,3 +158,11 @@@ endif::git-pull[
        by default when it is attached to a terminal, unless -q
        is specified. This flag forces progress status even if the
        standard error stream is not directed to a terminal.
 +
 +-4::
 +--ipv4::
 +      Use IPv4 addresses only, ignoring IPv6 addresses.
 +
 +-6::
 +--ipv6::
 +      Use IPv6 addresses only, ignoring IPv4 addresses.