Merge branch 'gb/1.7.0-diff-whitespace-only-output'

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 28868747dac778dd1c527f3e40446edd739a5ba9..ab6419fe6e44c7008cbff4e1fae48a70cfb82ac0 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -1,3 +1,6 @@
+--all::
+       Fetch all remotes.
+
 -a::
 --append::
        Append ref names and object names of fetched refs to the
@@ -9,6 +12,11 @@
        `git clone` with `--depth=<depth>` option (see linkgit:git-clone[1])
        by the specified number of commits.
 
+ifndef::git-pull[]
+--dry-run::
+       Show what would be done, without making any changes.
+endif::git-pull[]
+
 -f::
 --force::
        When 'git-fetch' is used with `<rbranch>:<lbranch>`
@@ -21,6 +29,16 @@
 --keep::
        Keep downloaded pack.
 
+ifndef::git-pull[]
+--multiple::
+       Allow several <repository> and <group> arguments to be
+       specified. No <refspec>s may be specified.
+
+--prune::
+       After fetching, remove any remote tracking branches which
+       no longer exist on the remote.
+endif::git-pull[]
+
 ifdef::git-pull[]
 --no-tags::
 endif::git-pull[]