summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-09 00:50:02 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-09 17:57:03 -0800
commit71dfbf224ff980f4085f75868dc409118418731e (patch)
treea15941410daa08629a9678b821c595c311372fed /builtin.h
parent1c23d794bfa3b9f3e03b18bb7e542615a924dbe3 (diff)
downloadgit-71dfbf224ff980f4085f75868dc409118418731e.tar.gz
Make merge-base a built-in.
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 df72d09447..ae32993ce9 100644
--- a/builtin.h
+++ b/builtin.h
@@ -42,6 +42,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);