projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b56fca0) | patch
Add merge-subtree back
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 Feb 2008 19:08:25 +0000 (11:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 Feb 2008 19:14:56 +0000 (11:14 -0800)
commit1736855c9b59ac787af979a44840a58361cbaf66
treef7193190c01e6c995dcdeecee8c7270183f34c45tree | snapshot
parentb56fca07d2bac20339d59218ab98de38a9363e77commit | diff
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>
Makefile diff | blob | history
git.c diff | blob | history
t/t6029-merge-subtree.sh [new file with mode: 0755] blob
Git—the stupid content tracker