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

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 8b0cf581962e48f85ff35cbe3c9eeec1109a9971..ab6419fe6e44c7008cbff4e1fae48a70cfb82ac0 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -12,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>`
@@ -28,6 +33,10 @@ 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[]