From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Jan 2014 18:47:09 +0000 (-0800)
Subject: Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfix
X-Git-Tag: v1.9-rc1~23^2~1
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=8be1d04a7e9251380a5de80564284f0099774038

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"
---

8be1d04a7e9251380a5de80564284f0099774038
diff --cc Documentation/git-pull.txt
index 24ab07a3f8,0e7a1fe8ae..546f7b195c
--- a/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.