summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-31 21:54:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-31 21:54:12 (GMT)
commitad00aebfe93b3fc79c5ed54569f1603b8030783a (patch)
treee41f9df2842aa74a3c692d733e1a09d708c2c413
parentab0fb57aac6c5b6f074c07c7e2729bcff58cc45d (diff)
parentd50d31e8808261eccfa6bde826e5e63368e29573 (diff)
downloadgit-ad00aebfe93b3fc79c5ed54569f1603b8030783a.zip
git-ad00aebfe93b3fc79c5ed54569f1603b8030783a.tar.gz
git-ad00aebfe93b3fc79c5ed54569f1603b8030783a.tar.bz2
Merge branch 'ss/pull-rebase-preserve' into maint
* ss/pull-rebase-preserve: docs: clarify what git-rebase's "-p" / "--preserve-merges" does docs: clarify "preserve" option wording for git-pull
-rw-r--r--Documentation/git-pull.txt5
-rw-r--r--Documentation/git-rebase.txt4
2 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 200eb22..4064452 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.
+
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 924827d..c8ab48d 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -362,7 +362,9 @@ default is `--no-fork-point`, otherwise the default is `--fork-point`.
-p::
--preserve-merges::
- Instead of ignoring merges, try to recreate them.
+ Recreate merge commits instead of flattening the history by replaying
+ commits a merge commit introduces. Merge conflict resolutions or manual
+ amendments to merge commits are not preserved.
+
This uses the `--interactive` machinery internally, but combining it
with the `--interactive` option explicitly is generally not a good