Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfix

* jc/maint-pull-docfix-for-409b8d82:
  Documentation: exclude irrelevant options from "git pull"

diff --cc Documentation/git-pull.txt
index 24ab07a3f8f80c56cbbd7feffc1b5bf65e137968,0e7a1fe8ae49fd2f466ff65898b8d859ca4f8240..546f7b195ccbdf527824c1e7c288f423f012dabf
--- 1/Documentation/git-pull.txt
--- 2/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@@ -97,21 -42,17 +97,21 @@@ must be given before the options meant 
  Options related to merging
  ~~~~~~~~~~~~~~~~~~~~~~~~~~
  
- include::merge-options.txt[]
- 
  :git-pull: 1
  
+ include::merge-options.txt[]
+ 
 +-r::
  --rebase::
 -      Instead of a merge, perform a rebase after fetching.  If
 -      there is a remote ref for the upstream branch, and this branch
 -      was rebased since last fetched, the rebase uses that information
 -      to avoid rebasing non-local changes. To make this the default
 -      for branch `<name>`, set configuration `branch.<name>.rebase`
 -      to `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.
 ++
 +See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in
 +linkgit:git-config[1] if you want to make `git pull` always use
 +`--rebase` instead of merging.
  +
  [NOTE]
  This is a potentially _dangerous_ mode of operation.