summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-09 22:13:13 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-09 22:30:21 (GMT)
commit22f77b772dd16e6b63ff7c0359fd37e7d14cc04d (patch)
tree0d6d132bf5d075610e6fbc5e7570803886b922b2 /Makefile
parent438195ccedce7270cf5ba167a940c90467cb72d7 (diff)
downloadgit-22f77b772dd16e6b63ff7c0359fd37e7d14cc04d.zip
git-22f77b772dd16e6b63ff7c0359fd37e7d14cc04d.tar.gz
git-22f77b772dd16e6b63ff7c0359fd37e7d14cc04d.tar.bz2
[PATCH] Add git-diff-stages command.
The diff-* brothers acquired a sibling, git-diff-stages. With an unmerged index file, you specify two stage numbers and it shows the differences between them. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b02c234..ec62424 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ PROG= git-update-cache git-diff-files git-init-db git-write-tree \
git-http-pull git-ssh-push git-ssh-pull git-rev-list git-mktag \
git-diff-helper git-tar-tree git-local-pull git-write-blob \
git-get-tar-commit-id git-mkdelta git-apply git-stripspace \
- git-cvs2git
+ git-cvs2git git-diff-stages
all: $(PROG)
@@ -117,6 +117,7 @@ git-write-blob: write-blob.c
git-mkdelta: mkdelta.c
git-stripspace: stripspace.c
git-cvs2git: cvs2git.c
+git-diff-stages: diff-stages.c
git-http-pull: LIBS += -lcurl
git-rev-list: LIBS += -lssl