![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 22 Jan 2010 02:25:20 +0000 (18:25 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jan 2010 04:06:58 +0000 (20:06 -0800) | ||
| commit | 907a7cb51c6c44d25f4c734a46d5174363190a84 | |
| tree | 437762890f02ae63b73763aa666117b6882ee068 | tree | snapshot |
| parent | a5031214c4fe5f5d3fcf649d10769744cbc66fed | commit | diff |
make "git merge-tree" a built-in
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Makefile | diff | blob | history | |
| builtin-merge-tree.c | [new file with mode: 0644] | blob |
| builtin.h | diff | blob | history | |
| git.c | diff | blob | history | |
| merge-tree.c | [deleted file] | blob | history |