summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-09 08:50:02 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-10 01:57:03 (GMT)
commit71dfbf224ff980f4085f75868dc409118418731e (patch)
treea15941410daa08629a9678b821c595c311372fed /git.c
parent1c23d794bfa3b9f3e03b18bb7e542615a924dbe3 (diff)
downloadgit-71dfbf224ff980f4085f75868dc409118418731e.zip
git-71dfbf224ff980f4085f75868dc409118418731e.tar.gz
git-71dfbf224ff980f4085f75868dc409118418731e.tar.bz2
Make merge-base a built-in.
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 bf55499..e7bc79a 100644
--- a/git.c
+++ b/git.c
@@ -238,6 +238,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "ls-tree", cmd_ls_tree, RUN_SETUP },
{ "mailinfo", cmd_mailinfo },
{ "mailsplit", cmd_mailsplit },
+ { "merge-base", cmd_merge_base, RUN_SETUP },
{ "merge-file", cmd_merge_file },
{ "mv", cmd_mv, RUN_SETUP },
{ "name-rev", cmd_name_rev, RUN_SETUP },