aboutsummaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-13 16:50:32 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-13 16:54:35 -0800
commit4a164d48df6bb1b4a771741c63d4437fd2dca0bb (patch)
tree73e3b0ca16e8ea83e9f761af476736c29b24caf9 /builtin.h
parentf8f2aaa17297d6b21c84641edc2f6135575a003c (diff)
parent03840fc32d783be6750bf7e41a89687b8c3053eb (diff)
downloadgit-4a164d48df6bb1b4a771741c63d4437fd2dca0bb.tar.gz
git-4a164d48df6bb1b4a771741c63d4437fd2dca0bb.tar.xz
Merge branch 'jc/merge-base' (early part)
This contains an evil merge to fast-import, in order to resolve in_merge_bases() update.
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 716014823..57e8741ff 100644
--- a/builtin.h
+++ b/builtin.h
@@ -44,6 +44,7 @@ extern int cmd_ls_files(int argc, const char **argv, const char *prefix);
extern int cmd_ls_tree(int argc, const char **argv, const char *prefix);
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_base(int argc, const char **argv, const char *prefix);
extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
extern int cmd_mv(int argc, const char **argv, const char *prefix);
extern int cmd_name_rev(int argc, const char **argv, const char *prefix);