diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 18:25:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-21 20:06:58 -0800 |
| commit | 907a7cb51c6c44d25f4c734a46d5174363190a84 (patch) | |
| tree | 437762890f02ae63b73763aa666117b6882ee068 /Makefile | |
| parent | a5031214c4fe5f5d3fcf649d10769744cbc66fed (diff) | |
| download | git-907a7cb51c6c44d25f4c734a46d5174363190a84.tar.gz git-907a7cb51c6c44d25f4c734a46d5174363190a84.tar.xz | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -391,7 +391,6 @@ PROGRAMS += git-hash-object$X PROGRAMS += git-imap-send$X PROGRAMS += git-index-pack$X PROGRAMS += git-merge-index$X -PROGRAMS += git-merge-tree$X PROGRAMS += git-mktag$X PROGRAMS += git-pack-redundant$X PROGRAMS += git-patch-id$X @@ -672,6 +671,7 @@ BUILTIN_OBJS += builtin-merge-base.o BUILTIN_OBJS += builtin-merge-file.o BUILTIN_OBJS += builtin-merge-ours.o BUILTIN_OBJS += builtin-merge-recursive.o +BUILTIN_OBJS += builtin-merge-tree.o BUILTIN_OBJS += builtin-mktree.o BUILTIN_OBJS += builtin-mv.o BUILTIN_OBJS += builtin-name-rev.o |