kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Miklos Vajna 2008-03-18 13:26:43 +01:00 committed by Junio C Hamano
parent 420e9af498
commit 02b00e16bb
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/merge-strategies.txt
View File

@ -33,3 +33,10 @@ ours::
merge is always the current branch head. It is meant to merge is always the current branch head. It is meant to
be used to supersede old development history of side be used to supersede old development history of side
branches. 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.