![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Thomas Harning <harningt@gmail.com> | |
| Thu, 22 Nov 2007 20:19:40 +0000 (15:19 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 22 Nov 2007 22:21:59 +0000 (14:21 -0800) | ||
| commit | a00a42ae33708caa742d9e9fbf10692cfa42f032 | |
| tree | d14676ffff8533ab5edd6c9bc790097c6f7e5dd6 | tree | snapshot |
| parent | a7d9da6c972cb7bc79ef47ad7199dfb2a8dcf67f | commit | 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>
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 | history | |
| builtin-merge-ours.c | [new file with mode: 0644] | blob |
| builtin.h | diff | blob | history | |
| contrib/examples/git-merge-ours.sh | [new file with mode: 0755] | blob |
| git-merge-ours.sh | [deleted file] | blob | history |
| git.c | diff | blob | history |