make "merge-index" a built-in

diff --git a/git.c b/git.c
index b60999ca9ebdb3582ed8cc790e0722a450bb2e40..eae12e32eafcc6185e783f2be9859126e7aa4a33 100644 (file)
--- a/git.c
+++ b/git.c
@@ -331,6 +331,7 @@ static void handle_internal_command(int argc, const char **argv)
                { "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE },
                { "merge-base", cmd_merge_base, RUN_SETUP },
                { "merge-file", cmd_merge_file },
+               { "merge-index", cmd_merge_index, RUN_SETUP },
                { "merge-ours", cmd_merge_ours, RUN_SETUP },
                { "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },
                { "merge-recursive-ours", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE },