X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Makefile;h=b15727391422083ec6012d0196e5afb0f36ff704;hb=9945d9805130fdb752a91fcfae7084b219b9dec3;hp=7c2c1b553e1ebe571e1f05113a6f04f59194c5b7;hpb=7912c07037cf704394e9bcb7cb24c05ee03aa921;p=git.git

diff --git a/Makefile b/Makefile
index 7c2c1b55..b1572739 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,20 @@
+# -DCOLLISION_CHECK if you believe that SHA1's
+# 1461501637330902918203684832716283019655932542976 hashes do not give you
+# enough guarantees about no collisions between objects ever hapenning.
+#
+# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
+# Note that you need some new glibc (at least >2.2.4) for this, and it will
+# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
+# break unless your underlying filesystem supports those sub-second times
+# (my ext3 doesn't).
 CFLAGS=-g -O3 -Wall
+
 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)
 
@@ -53,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