Merge branch 'tb/blame-resurrect-convert-to-git' into maint
[gitweb.git] / Documentation / git-pull.txt
index d3d236cd1f5e2db69b0b234a9be5b5066dd80d52..712ab4baed2c6802ddd96681f11c7f05a436f48b 100644 (file)
@@ -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.
 +