From a00a42ae33708caa742d9e9fbf10692cfa42f032 Mon Sep 17 00:00:00 2001 From: Thomas Harning Date: Thu, 22 Nov 2007 15:19:40 -0500 Subject: git-merge-ours: make it a builtin. Except that this fixes a longstanding corner case bug by tightening the way underlying diff-index command is run, it is functionally equivalent to the scripted version. Signed-off-by: Thomas Harning Jr Signed-off-by: Junio C Hamano --- git.c | 1 + 1 file changed, 1 insertion(+) (limited to 'git.c') diff --git a/git.c b/git.c index 7604319b5a..80c2f14a8b 100644 --- a/git.c +++ b/git.c @@ -325,6 +325,7 @@ static void handle_internal_command(int argc, const char **argv) { "mailsplit", cmd_mailsplit }, { "merge-base", cmd_merge_base, RUN_SETUP }, { "merge-file", cmd_merge_file }, + { "merge-ours", cmd_merge_ours, RUN_SETUP }, { "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE }, { "name-rev", cmd_name_rev, RUN_SETUP }, { "pack-objects", cmd_pack_objects, RUN_SETUP }, -- cgit v1.2.1