summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-28 16:37:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-28 16:37:52 (GMT)
commit3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7 (patch)
tree3a73f3a9bfba6271f19c03b8553421ef6e61357c /Documentation
parentcf98c423b571e4afbd78fda3e65d03ed9bdd34fc (diff)
parent129260cbd42f2a9fb40055ac6ed32c7b75a5ec05 (diff)
downloadgit-3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7.zip
git-3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7.tar.gz
git-3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7.tar.bz2
Merge branch 'ss/pull-rebase-preserve'
* ss/pull-rebase-preserve: docs: clarify "preserve" option wording for git-pull
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-pull.txt5
1 files 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.
+