{"thread":{"id":"2365","subject":"[PATCH] Refactor merge strategies into separate includable file.","startedAt":"2005-11-06T16:26:07Z","lastAt":"2005-11-06T16:26:07Z","messageCount":1,"participants":["Jon Loeliger"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"11208","messageId":"E1EYnLL-00028e-CY@jdl.com","threadId":"2365","inReplyTo":null,"subject":"[PATCH] Refactor merge strategies into separate includable file.","fromName":"Jon Loeliger","fromEmail":"jdl@freescale.com","sentAt":"2005-11-06T16:26:07Z","receivedAt":"2005-11-06T16:26:07Z","isPatch":true,"sender":{"key":"jdl@jdl.com","avatar":"https://gravatar.com/avatar/75ce9a10b151acd2c28ec4ab2136dba7b2ff1634530bd04b155981a749d08a64?d=mp&s=160"},"body":"\nSigned-off-by: Jon Loeliger <jdl@freescale.com>\n---\n\n Documentation/git-merge.txt        |    2 ++\n Documentation/git-pull.txt         |   36 +-----------------------------------\n Documentation/merge-strategies.txt |   35 +++++++++++++++++++++++++++++++++++\n 3 files changed, 38 insertions(+), 35 deletions(-)\n create mode 100644 Documentation/merge-strategies.txt\n\napplies-to: 2a5577073c7747c11ad79f414603e68c5d95cf6b\nceda5bc3b5cb502edb3c0596aeede1a0ab9d4295\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 3e058db..b3ef19b 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -34,6 +34,8 @@ include::merge-pull-opts.txt[]\n \tleast one <remote>.  Specifying more than one <remote>\n \tobviously means you are trying an Octopus.\n \n+include::merge-strategies.txt[]\n+\n \n SEE ALSO\n --------\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex ec10a2f..7ebb08d 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -31,42 +31,8 @@ include::pull-fetch-param.txt[]\n \n include::merge-pull-opts.txt[]\n \n+include::merge-strategies.txt[]\n \n-MERGE STRATEGIES\n-----------------\n-\n-resolve::\n-\tThis can only resolve two heads (i.e. the current branch\n-\tand another branch you pulled from) using 3-way merge\n-\talgorithm.  It tries to carefully detect criss-cross\n-\tmerge ambiguities and is considered generally safe and\n-\tfast.  This is the default merge strategy when pulling\n-\tone branch.\n-\n-recursive::\n-\tThis can only resolve two heads using 3-way merge\n-\talgorithm.  When there are more than one common\n-\tancestors that can be used for 3-way merge, it creates a\n-\tmerged tree of the common ancestores and uses that as\n-\tthe reference tree for the 3-way merge.  This has been\n-\treported to result in fewer merge conflicts without\n-\tcausing mis-merges by tests done on actual merge commits\n-\ttaken from Linux 2.6 kernel development history.\n-\tAdditionally this can detect and handle merges involving\n-\trenames.\n-\n-octopus::\n-\tThis resolves more than two-head case, but refuses to do\n-\tcomplex merge that needs manual resolution.  It is\n-\tprimarily meant to be used for bundling topic branch\n-\theads together.  This is the default merge strategy when\n-\tpulling more than one branch.\n-\n-ours::\n-\tThis resolves any number of heads, but the result of the\n-\tmerge is always the current branch head.  It is meant to\n-\tbe used to supersede old development history of side\n-\tbranches.\n \n \n EXAMPLES\ndiff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt\nnew file mode 100644\nindex 0000000..3ec56d2\n--- /dev/null\n+++ b/Documentation/merge-strategies.txt\n@@ -0,0 +1,35 @@\n+MERGE STRATEGIES\n+----------------\n+\n+resolve::\n+\tThis can only resolve two heads (i.e. the current branch\n+\tand another branch you pulled from) using 3-way merge\n+\talgorithm.  It tries to carefully detect criss-cross\n+\tmerge ambiguities and is considered generally safe and\n+\tfast.  This is the default merge strategy when pulling\n+\tone branch.\n+\n+recursive::\n+\tThis can only resolve two heads using 3-way merge\n+\talgorithm.  When there are more than one common\n+\tancestors that can be used for 3-way merge, it creates a\n+\tmerged tree of the common ancestores and uses that as\n+\tthe reference tree for the 3-way merge.  This has been\n+\treported to result in fewer merge conflicts without\n+\tcausing mis-merges by tests done on actual merge commits\n+\ttaken from Linux 2.6 kernel development history.\n+\tAdditionally this can detect and handle merges involving\n+\trenames.\n+\n+octopus::\n+\tThis resolves more than two-head case, but refuses to do\n+\tcomplex merge that needs manual resolution.  It is\n+\tprimarily meant to be used for bundling topic branch\n+\theads together.  This is the default merge strategy when\n+\tpulling more than one branch.\n+\n+ours::\n+\tThis resolves any number of heads, but the result of the\n+\tmerge is always the current branch head.  It is meant to\n+\tbe used to supersede old development history of side\n+\tbranches.\n---\n0.99.9.GIT\n"}]}