diff options
| author | Daniel Barkalow <barkalow@iabervon.org> | 2005-04-18 11:39:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 11:39:48 -0700 |
| commit | b5039db6d25ae25f1cb2db541ed13602784fafc3 (patch) | |
| tree | 6ed59f0fe035b53766aaf0376534c0271f509b95 /Makefile | |
| parent | ff5ebe39b0ca5cbdcbe11f092b5b43dbeada820e (diff) | |
| download | git-b5039db6d25ae25f1cb2db541ed13602784fafc3.tar.gz | |
[PATCH] Switch implementations of merge-base, port to parsing
This switches to my implementation of merge-base, but with the new parsing
library.
Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -64,8 +64,8 @@ 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) +merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o + $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS) read-cache.o: cache.h show-diff.o: cache.h |