summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 19:24:12 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 19:24:12 (GMT)
commit2fbdd1317480d2f14756d94e41a8eb07442d4841 (patch)
treea851ce1b68aad8616fd4eed75dc02c3de77b4802 /Makefile
parent7b937ca33142ff5ecc655f2be61678a512352122 (diff)
downloadgit-2fbdd1317480d2f14756d94e41a8eb07442d4841.zip
git-2fbdd1317480d2f14756d94e41a8eb07442d4841.tar.gz
git-2fbdd1317480d2f14756d94e41a8eb07442d4841.tar.bz2
Remove "merge-tree.c"
It's there in the history if somebody wants to resurrect it, but it seems to have been successfully superceded by the new and improved index-merge thing, where we do all merging entirely in the index.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index b157273..92de1cb 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ CC=gcc
PROG= update-cache show-diff init-db write-tree read-tree commit-tree \
cat-file fsck-cache checkout-cache diff-tree rev-tree show-files \
- check-files ls-tree merge-tree
+ check-files ls-tree
all: $(PROG)
@@ -64,9 +64,6 @@ check-files: check-files.o read-cache.o
ls-tree: ls-tree.o read-cache.o
$(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
-merge-tree: merge-tree.o read-cache.o
- $(CC) $(CFLAGS) -o merge-tree merge-tree.o read-cache.o $(LIBS)
-
read-cache.o: cache.h
show-diff.o: cache.h