Re: [PATCH] docs: Clarify "preserve" option wording for git-pull
- From
Sebastian Schuberth <sschuberth@gmail.com>
- Date
- Mar 26, 2015, 20:11 UTC
- Message-ID
- <551467E9.8080409@gmail.com>
- In-Reply-To
- <xmqqh9t7zmkt.fsf@gitster.dls.corp.google.com>
Before this path, the "also" sounded as if "preserve" was doing a rebase as additional work that "true" would not do. Clarify this by omitting the "also" and rewording the sentence a bit.
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> --- Documentation/git-pull.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index d3d236c..712ab4b 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. +
-- 1.9.5.msysgit.1