diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-03-18 13:26:43 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-19 01:43:02 -0700 |
| commit | 02b00e16bb372fd13e1ac440e9fbafd223d43af0 (patch) | |
| tree | 8e5c54c608aefccafd4f5a9a04637576ed8ff4b5 /Documentation/merge-strategies.txt | |
| parent | 420e9af498848f9a3994ecb471dc51d5203f51cd (diff) | |
| download | git-02b00e16bb372fd13e1ac440e9fbafd223d43af0.tar.gz git-02b00e16bb372fd13e1ac440e9fbafd223d43af0.tar.xz | |
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>
Diffstat (limited to 'Documentation/merge-strategies.txt')
| -rw-r--r-- | 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 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. |