diff options
author | Junio C Hamano <junkio@cox.net> | 2007-01-09 00:50:02 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-01-09 17:57:03 -0800 |
commit | 71dfbf224ff980f4085f75868dc409118418731e (patch) | |
tree | a15941410daa08629a9678b821c595c311372fed /builtin.h | |
parent | 1c23d794bfa3b9f3e03b18bb7e542615a924dbe3 (diff) | |
download | git-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.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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); |