{"thread":{"id":"12742","subject":"[PATCH] Documentation/git-merge: document subtree strategy.","startedAt":"2008-03-18T12:26:43Z","lastAt":"2008-03-18T12:26:43Z","messageCount":1,"participants":["Miklos Vajna"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"72352","messageId":"20080318122643.GC15297@genesis.frugalware.org","threadId":"12742","inReplyTo":null,"subject":"[PATCH] Documentation/git-merge: document subtree strategy.","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-03-18T12:26:43Z","receivedAt":"2008-03-18T12:26:43Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"There was already some documentation about subtree under\nDocumentation/howto but it was missing from git-merge manpage.\n\nSigned-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n\nBased on the commit message of 68faf68938ee943fc251c702f2027e4dfda354db.\n\n Documentation/merge-strategies.txt |    7 +++++++\n 1 files changed, 7 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt\nindex 7df0266..1276f85 100644\n--- a/Documentation/merge-strategies.txt\n+++ b/Documentation/merge-strategies.txt\n@@ -33,3 +33,10 @@ ours::\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+subtree::\n+\tThis is a modified recursive strategy. When merging trees A and\n+\tB, if B corresponds to a subtree of A, B is first adjusted to\n+\tmatch the tree structure of A, instead of reading the trees at\n+\tthe same level. This adjustment is also done to the common\n+\tancestor tree.\n-- \n1.5.4.3\n"}]}