diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-22 07:29:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 10:01:21 -0800 |
| commit | 0ecace728f8e48b87f81433b053d7f277f22e674 (patch) | |
| tree | bb7fba5beef76521154779bc8aa90c0dbe59ddd9 /Makefile | |
| parent | 07c073206798483c9916d492dfc6faf7400a50ad (diff) | |
| download | git-0ecace728f8e48b87f81433b053d7f277f22e674.tar.gz git-0ecace728f8e48b87f81433b053d7f277f22e674.tar.xz | |
make "merge-index" a built-in
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -389,7 +389,6 @@ PROGRAMS += $(EXTRA_PROGRAMS) PROGRAMS += git-fast-import$X PROGRAMS += git-imap-send$X PROGRAMS += git-index-pack$X -PROGRAMS += git-merge-index$X PROGRAMS += git-mktag$X PROGRAMS += git-pack-redundant$X PROGRAMS += git-shell$X @@ -667,6 +666,7 @@ BUILTIN_OBJS += builtin-mailsplit.o BUILTIN_OBJS += builtin-merge.o BUILTIN_OBJS += builtin-merge-base.o BUILTIN_OBJS += builtin-merge-file.o +BUILTIN_OBJS += builtin-merge-index.o BUILTIN_OBJS += builtin-merge-ours.o BUILTIN_OBJS += builtin-merge-recursive.o BUILTIN_OBJS += builtin-merge-tree.o |