From 129260cbd42f2a9fb40055ac6ed32c7b75a5ec05 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Thu, 26 Mar 2015 21:11:21 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/git-pull.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Documentation/git-pull.txt') diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 200eb22260..4064452b06 100644 --- 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. + -- cgit v1.2.3