Do a very simple "merge-base" that finds the most recent common

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index ac61a61..871c0bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +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-base
 
 all: $(PROG)
 
@@ -57,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-base: merge-base.o read-cache.o
+       $(CC) $(CFLAGS) -o merge-base merge-base.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