From: Miklos Vajna Date: Tue, 18 Mar 2008 12:26:43 +0000 (+0100) Subject: Documentation/git-merge: document subtree strategy. X-Git-Tag: v1.5.5-rc1~14 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=02b00e16bb372fd13e1ac440e9fbafd223d43af0;p=git.git 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 Signed-off-by: Junio C Hamano --- 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.