From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Jan 2014 18:44:00 +0000 (-0800)
Subject: Merge branch 'jc/maint-pull-docfix'
X-Git-Tag: v1.9-rc1~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2

Merge branch 'jc/maint-pull-docfix'

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

6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2
diff --cc Documentation/git-pull.txt
index 6083aab87b,546f7b195c..200eb22260
--- a/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