]> git.ipfire.org Git - thirdparty/git.git/commit - Makefile
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a7d9da6) | patch
git-merge-ours: make it a builtin.
authorThomas Harning <harningt@gmail.com>
Thu, 22 Nov 2007 20:19:40 +0000 (15:19 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Nov 2007 22:21:59 +0000 (14:21 -0800)
commita00a42ae33708caa742d9e9fbf10692cfa42f032
treed14676ffff8533ab5edd6c9bc790097c6f7e5dd6tree | snapshot
parenta7d9da6c972cb7bc79ef47ad7199dfb2a8dcf67fcommit | diff
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>
Makefile diff | blob | blame | history
builtin-merge-ours.c [new file with mode: 0644] blob
builtin.h diff | blob | blame | history
contrib/examples/git-merge-ours.sh [moved from git-merge-ours.sh with 100% similarity] blob | blame | history
git.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.