Merge branch 'ss/pull-rebase-preserve'

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

diff --combined Documentation/git-pull.txt
index d3d236cd1f5e2db69b0b234a9be5b5066dd80d52,4064452b066ef91a900c3e602448d2c67d7ab75d..712ab4baed2c6802ddd96681f11c7f05a436f48b
--- 1/Documentation/git-pull.txt
--- 2/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.
  +