From: Sverre Hvammen Johansen <hvammen@xxxxxxxxx>
Added some documentation for how git-merge currently
works when more than two histories are joined.
Signed-off-by: Sverre Hvammen Johansen <hvammen@xxxxxxxxx>
---
Documentation/git-merge.txt | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index ef1f055..5924c1a 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -151,6 +151,42 @@ After seeing a conflict, you can do two things:
should be, and run `git-commit` to commit the result.
+JOINING MORE THAN TWO HISTORIES
+-------------------------------
+
+More than one remote may be specified on the command line. Those
+remotes are used for selecting the merge startegy and is also used in
+the merge commit message. However, some of these remotes may not be
+independent. Only remotes with independent heads (reduced parents)
+will be recorded in the merge commit object.
+
+The following shows master and two topic branches. topicB is based
+on topicA, topicA is previously branched off from master:
+
+------------
+ o---o---o topicB
+ /
+ o---o---o topicA
+ /
+ o---o---o---o---o---o---o master
+
+------------
+
+Merging topicA and topicB to the master branch will select the merge
+strategy based on all three branches (an Octopus). master and topicB
+are the reduced parents and are therefore the only parents recorded in
+the merge commit object:
+
+------------
+
+ o---o---o topicB
+ / \
+ o---o---o topicA o master
+ / /
+ o---o---o---o---o---o---o
+
+------------
+
SEE ALSO
--------
linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1],
--
1.5.5.1.499.g878b8
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
