kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
13,732 Commits
6 Branches
991 Tags
175 MiB
Commit Graph

2 Commits (5eee6b28b5fc6be03a89dfa6b6ca502ec49dc2df)

Author SHA1 Message Date
Miklos Vajna 419e38337a Improve t6029 to check the real "subtree" case 
t6029 already checks if subtree available and works like recursive. This
patch adds code to test test the extra functionality the subtree merge
strategy provides.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-02-29 00:00:29 -08:00
Junio C Hamano 1736855c9b Add merge-subtree back 
An earlier commit e1b3a2c (Build-in merge-recursive) made the
subtree merge strategy backend unavailable.  This resurrects
it.

A new test t6029 currently only tests the strategy is available,
but it should be enhanced to check the real "subtree" case.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2008-02-23 11:14:56 -08:00