aboutsummaryrefslogtreecommitdiff
path: root/git.c
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 /git.c
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 'git.c')
-rw-r--r--git.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/git.c b/git.c
index 6e6c44822..4dd196721 100644
--- a/git.c
+++ b/git.c
@@ -256,6 +256,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 | NOT_BARE },
{ "name-rev", cmd_name_rev, RUN_SETUP },