summaryrefslogtreecommitdiff
path: root/builtin.h
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 /builtin.h
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 'builtin.h')
-rw-r--r--builtin.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin.h b/builtin.h
index cb8489f..e961b33 100644
--- a/builtin.h
+++ b/builtin.h
@@ -68,6 +68,7 @@ extern int cmd_mailinfo(int argc, const char **argv, const char *prefix);
extern int cmd_mailsplit(int argc, const char **argv, const char *prefix);
extern int cmd_merge(int argc, const char **argv, const char *prefix);
extern int cmd_merge_base(int argc, const char **argv, const char *prefix);
+extern int cmd_merge_index(int argc, const char **argv, const char *prefix);
extern int cmd_merge_ours(int argc, const char **argv, const char *prefix);
extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
extern int cmd_merge_recursive(int argc, const char **argv, const char *prefix);