Documentation/git-merge: document subtree strategy.
There was already some documentation about subtree under Documentation/howto but it was missing from git-merge manpage. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Miklos Vajna committed
Mar 18, 2008 at 13:26 UTC
02b00e16bb372fd13e1ac440e9fbafd223d43af0
1 file changed
+7
Documentation/merge-strategies.txt
+7
@@ -33,3 +33,10 @@ ours::
33
merge is always the current branch head. It is meant to
34
be used to supersede old development history of side
35
branches.
36
+
37
+subtree::
38
+ This is a modified recursive strategy. When merging trees A and
39
+ B, if B corresponds to a subtree of A, B is first adjusted to
40
+ match the tree structure of A, instead of reading the trees at
41
+ the same level. This adjustment is also done to the common
42
+ ancestor tree.