From: Miklos Vajna Date: Tue, 18 Mar 2008 12:26:43 GMT Subject: [PATCH] Documentation/git-merge: document subtree strategy. Message-ID: <20080318122643.GC15297@genesis.frugalware.org> There was already some documentation about subtree under Documentation/howto but it was missing from git-merge manpage. Signed-off-by: Miklos Vajna --- Based on the commit message of 68faf68938ee943fc251c702f2027e4dfda354db. Documentation/merge-strategies.txt | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 7df0266..1276f85 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. -- 1.5.4.3