MinGW: 64-bit file offsets

[git.git] / Documentation / merge-strategies.txt

diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 7df0266ba88b13db52a10b2af6dc620b851b9695..1276f858ade29bec40716d19cf56fe6e3882fc25 100644 (file)
--- 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.