diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-22 02:25:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 04:06:58 (GMT) |
| commit | 907a7cb51c6c44d25f4c734a46d5174363190a84 (patch) | |
| tree | 437762890f02ae63b73763aa666117b6882ee068 /git.c | |
| parent | a5031214c4fe5f5d3fcf649d10769744cbc66fed (diff) | |
| download | git-907a7cb51c6c44d25f4c734a46d5174363190a84.zip git-907a7cb51c6c44d25f4c734a46d5174363190a84.tar.gz git-907a7cb51c6c44d25f4c734a46d5174363190a84.tar.bz2 | |
make "git merge-tree" a built-in
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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
@@ -335,6 +335,7 @@ static void handle_internal_command(int argc, const char **argv) { "merge-recursive-ours", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, { "merge-recursive-theirs", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, { "merge-subtree", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE }, + { "merge-tree", cmd_merge_tree, RUN_SETUP }, { "mktree", cmd_mktree, RUN_SETUP }, { "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE }, { "name-rev", cmd_name_rev, RUN_SETUP }, |