summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-18 02:52:54 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-18 02:52:54 (GMT)
commit75118b13bc8187c629886b108929f996c47daf01 (patch)
tree7a191717f2b03af0ac1978e9cfc19826836f5c3c /Makefile
parent74b2428f5573b1f68ce717706296ae7d1832cd65 (diff)
downloadgit-75118b13bc8187c629886b108929f996c47daf01.zip
git-75118b13bc8187c629886b108929f996c47daf01.tar.gz
git-75118b13bc8187c629886b108929f996c47daf01.tar.bz2
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.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 871c0bb..76c4f7c 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