X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-strategies.txt;h=1276f858ade29bec40716d19cf56fe6e3882fc25;hb=d84ae0dbd53a29887256c0ea7375ae8524671af9;hp=7df0266ba88b13db52a10b2af6dc620b851b9695;hpb=cef19c7af5202c547abe4c8a538ac7b9a4970f0e;p=git.git

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 7df0266ba..1276f858a 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -33,3 +33,10 @@ ours::
 	merge is always the current branch head.  It is meant to
 	be used to supersede old development history of side
 	branches.
+
+subtree::
+	This is a modified recursive strategy. When merging trees A and
+	B, if B corresponds to a subtree of A, B is first adjusted to
+	match the tree structure of A, instead of reading the trees at
+	the same level. This adjustment is also done to the common
+	ancestor tree.