docs: clarify "preserve" option wording for git-pull
The "also" sounds as if "preserve" does a rebase as an additional step that "true" would not do, but that is not the case. Clarify this by omitting "also", and rewording the sentence a bit. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sebastian Schuberth committed
Mar 26, 2015 at 21:11 UTC
129260cbd42f2a9fb40055ac6ed32c7b75a5ec05
1 file changed
+2
-3
Documentation/git-pull.txt
+2
-3
@@ -111,9 +111,8 @@ include::merge-options.txt[]
111
was rebased since last fetched, the rebase uses that information
112
to avoid rebasing non-local changes.
113
+
114
-When preserve, also rebase the current branch on top of the upstream
115
-branch, but pass `--preserve-merges` along to `git rebase` so that
116
-locally created merge commits will not be flattened.
114
+When set to preserve, rebase with the `--preserve-merges` option passed
115
+to `git rebase` so that locally created merge commits will not be flattened.
116
+
117
When false, merge the current branch into the upstream branch.
118
+