diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-23 20:08:25 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-23 20:14:56 +0100 |
| commit | 1736855c9b59ac787af979a44840a58361cbaf66 (patch) | |
| tree | f7193190c01e6c995dcdeecee8c7270183f34c45 /git.c | |
| parent | checkout: updates to tracking report (diff) | |
| download | git-1736855c9b59ac787af979a44840a58361cbaf66.tar.xz git-1736855c9b59ac787af979a44840a58361cbaf66.zip | |
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>
Diffstat (limited to 'git.c')
| -rw-r--r-- | git.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -332,6 +332,7 @@ static void handle_internal_command(int argc, const char **argv) { "merge-file", cmd_merge_file }, { "merge-ours", cmd_merge_ours, RUN_SETUP }, { "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, + { "merge-subtree", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, { "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE }, { "name-rev", cmd_name_rev, RUN_SETUP }, { "pack-objects", cmd_pack_objects, RUN_SETUP }, |