aboutsummaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-07-07 19:24:20 +0200
committerJunio C Hamano <gitster@pobox.com>2008-07-07 17:50:01 -0700
commit1c7b76be7d620bbaf2e6b8417f04012326bbb9df (patch)
tree1245fa311746c7d0c0ec78a7d773a57edb5460a5 /git.c
parent1c6669351a47c834cceb75d6044a1aae259fc69f (diff)
downloadgit-1c7b76be7d620bbaf2e6b8417f04012326bbb9df.tar.gz
git-1c7b76be7d620bbaf2e6b8417f04012326bbb9df.tar.xz
Build in merge
Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 2fbe96b9b..770aadd0a 100644
--- a/git.c
+++ b/git.c
@@ -271,6 +271,7 @@ static void handle_internal_command(int argc, const char **argv)
{ "ls-remote", cmd_ls_remote },
{ "mailinfo", cmd_mailinfo },
{ "mailsplit", cmd_mailsplit },
+ { "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE },
{ "merge-base", cmd_merge_base, RUN_SETUP },
{ "merge-file", cmd_merge_file },
{ "merge-ours", cmd_merge_ours, RUN_SETUP },