Merge branch 'jc/maint-pull-docfix' into maint

The documentation to "git pull" hinted there is an "-m" option
because it incorrectly shared the documentation with "git merge".

* jc/maint-pull-docfix:
  Documentation: "git pull" does not have the "-m" option
  Documentation: exclude irrelevant options from "git pull"

diff --cc Documentation/git-pull.txt
index 6083aab87bd947c8528cbf347769b6621531b035,546f7b195ccbdf527824c1e7c288f423f012dabf..200eb22260069af7a9e2e248f0794a73e2cf4a9f
--- 1/Documentation/git-pull.txt
--- 2/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@@ -99,23 -97,17 +99,23 @@@ must be given before the options meant 
  Options related to merging
  ~~~~~~~~~~~~~~~~~~~~~~~~~~
  
- include::merge-options.txt[]
- 
  :git-pull: 1
  
+ include::merge-options.txt[]
+ 
  -r::
 ---rebase::
 -      Rebase the current branch on top of the upstream branch after
 -      fetching.  If there is a remote-tracking branch corresponding to
 -      the upstream branch and the upstream branch was rebased since last
 -      fetched, the rebase uses that information to avoid rebasing
 -      non-local changes.
 +--rebase[=false|true|preserve]::
 +      When true, rebase the current branch on top of the upstream
 +      branch after fetching. If there is a remote-tracking branch
 +      corresponding to the upstream branch and the upstream branch
 +      was rebased since last fetched, the rebase uses that information
 +      to avoid rebasing non-local changes.
 ++
 +When preserve, also rebase the current branch on top of the upstream
 +branch, but pass `--preserve-merges` along to `git rebase` so that
 +locally created merge commits will not be flattened.
 ++
 +When false, merge the current branch into the upstream branch.
  +
  See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in
  linkgit:git-config[1] if you want to make `git pull` always use

diff --cc Documentation/merge-options.txt
Simple merge