From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 28 Mar 2015 16:37:51 +0000 (-0700)
Subject: Merge branch 'ss/pull-rebase-preserve'
X-Git-Tag: v2.4.0-rc1~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7?ds=inline;hp=-c

Merge branch 'ss/pull-rebase-preserve'

* ss/pull-rebase-preserve:
docs: clarify "preserve" option wording for git-pull
---

3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7
diff --combined Documentation/git-pull.txt
index d3d236cd1f,4064452b06..712ab4baed
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@@ -111,13 -111,12 +111,12 @@@ include::merge-options.txt[
  	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 set to preserve, rebase with the `--preserve-merges` option passed
+ 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
 +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.
  +