Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index c7e5c74..b157273 100644 (file)
--- 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
+       check-files ls-tree merge-tree
 
 all: $(PROG)
 
@@ -64,11 +64,14 @@ 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
 
 clean:
-       rm -f *.o $(PROG) temp_git_file_*
+       rm -f *.o $(PROG)
 
 backup: clean
        cd .. ; tar czvf dircache.tar.gz dir-cache