From 75118b13bc8187c629886b108929f996c47daf01 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 17 Apr 2005 19:52:54 -0700 Subject: Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it. --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 871c0bb041..76c4f7ca4f 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 merge-base + check-files ls-tree merge-base merge-cache all: $(PROG) @@ -67,6 +67,9 @@ ls-tree: ls-tree.o read-cache.o merge-base: merge-base.o read-cache.o $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS) +merge-cache: merge-cache.o read-cache.o + $(CC) $(CFLAGS) -o merge-cache merge-cache.o read-cache.o $(LIBS) + read-cache.o: cache.h show-diff.o: cache.h -- cgit v1.2.1