summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-22 15:29:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-22 18:01:21 (GMT)
commit0ecace728f8e48b87f81433b053d7f277f22e674 (patch)
treebb7fba5beef76521154779bc8aa90c0dbe59ddd9 /git.c
parent07c073206798483c9916d492dfc6faf7400a50ad (diff)
downloadgit-0ecace728f8e48b87f81433b053d7f277f22e674.zip
git-0ecace728f8e48b87f81433b053d7f277f22e674.tar.gz
git-0ecace728f8e48b87f81433b053d7f277f22e674.tar.bz2
make "merge-index" 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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/git.c b/git.c
index b60999c..eae12e3 100644
--- 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 },