![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 22 Jan 2010 15:29:21 +0000 (07:29 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Jan 2010 18:01:21 +0000 (10:01 -0800) | ||
| commit | 0ecace728f8e48b87f81433b053d7f277f22e674 | |
| tree | bb7fba5beef76521154779bc8aa90c0dbe59ddd9 | tree | snapshot |
| parent | 07c073206798483c9916d492dfc6faf7400a50ad | commit | diff |
make "merge-index" 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-index.c | [new file with mode: 0644] | blob |
| builtin.h | diff | blob | history | |
| git.c | diff | blob | history | |
| merge-index.c | [deleted file] | blob | history |