summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-14 08:37:23 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-14 08:37:23 (GMT)
commit33deb63a36f523c513cf29598d9c05fe78a23cac (patch)
tree298e5d544d67bcc11e95aa6b04f1069a9cd959e6 /Makefile
parent458754a9fe2c2e889e38d1f4f53d5d457eba6faa (diff)
downloadgit-33deb63a36f523c513cf29598d9c05fe78a23cac.zip
git-33deb63a36f523c513cf29598d9c05fe78a23cac.tar.gz
git-33deb63a36f523c513cf29598d9c05fe78a23cac.tar.bz2
Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.
It only works one directory level at a time, so lookout..
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 92de1cb..b157273 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-tree
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-tree: merge-tree.o read-cache.o
+ $(CC) $(CFLAGS) -o merge-tree merge-tree.o read-cache.o $(LIBS)
+
read-cache.o: cache.h
show-diff.o: cache.h