diff options
| author | Thomas Harning <harningt@gmail.com> | 2007-11-22 15:19:40 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-22 14:21:59 -0800 |
| commit | a00a42ae33708caa742d9e9fbf10692cfa42f032 (patch) | |
| tree | d14676ffff8533ab5edd6c9bc790097c6f7e5dd6 /Makefile | |
| parent | a7d9da6c972cb7bc79ef47ad7199dfb2a8dcf67f (diff) | |
| download | git-a00a42ae33708caa742d9e9fbf10692cfa42f032.tar.gz git-a00a42ae33708caa742d9e9fbf10692cfa42f032.tar.xz | |
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 <harningt@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -221,7 +221,7 @@ SCRIPT_SH = \ git-sh-setup.sh \ git-am.sh \ git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \ - git-merge-resolve.sh git-merge-ours.sh \ + git-merge-resolve.sh \ git-lost-found.sh git-quiltimport.sh git-submodule.sh \ git-filter-branch.sh \ git-stash.sh @@ -353,6 +353,7 @@ BUILTIN_OBJS = \ builtin-mailsplit.o \ builtin-merge-base.o \ builtin-merge-file.o \ + builtin-merge-ours.o \ builtin-mv.o \ builtin-name-rev.o \ builtin-pack-objects.o \ |