diff options
| author | Sebastian Schuberth <sschuberth@gmail.com> | 2015-03-26 21:11:21 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-26 21:19:26 +0100 |
| commit | 129260cbd42f2a9fb40055ac6ed32c7b75a5ec05 (patch) | |
| tree | c97d5608d487c38d64bc9b9ad9c5b46665f21504 /Documentation/git-pull.txt | |
| parent | Merge branch 'maint-1.9' into maint-2.0 (diff) | |
| download | git-129260cbd42f2a9fb40055ac6ed32c7b75a5ec05.tar.xz git-129260cbd42f2a9fb40055ac6ed32c7b75a5ec05.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | Documentation/git-pull.txt | 5 |
1 files changed, 2 insertions, 3 deletions
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. + |