Merge branch 'ss/pull-rebase-preserve'

* ss/pull-rebase-preserve: docs: clarify "preserve" option wording for git-pull
git-mirror · Mar 28, 2015 · 3a18352 · 3a18352
2 parents cf98c42 + 129260c
commit 3a18352
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
@@ -111,9 +111,8 @@ 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.
 +