summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-17 19:18:17 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-17 19:18:17 (GMT)
commit6683463ed6b2da9eed309c305806f9393d1ae728 (patch)
tree6d296ca7b9d8916797835771722b0c46085a6ea4 /Makefile
parent15000d78996db926d18dd68e6f5f5770de09cad3 (diff)
downloadgit-6683463ed6b2da9eed309c305806f9393d1ae728.zip
git-6683463ed6b2da9eed309c305806f9393d1ae728.tar.gz
git-6683463ed6b2da9eed309c305806f9393d1ae728.tar.bz2
Do a very simple "merge-base" that finds the most recent common
parent of two commits. The question of "best" commit can probably be tweaked almost arbitrarily. In particular, trying to take things like how big the tree differences are into account migt be a good idea. This one is just very simple.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 92de1cb..871c0bb 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
+ check-files ls-tree merge-base
all: $(PROG)
@@ -64,6 +64,9 @@ 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