summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-04 13:22:01 -0800
committerJunio C Hamano <junkio@cox.net>2006-03-04 13:22:01 -0800
commitf2fea68a0fc29c6378748853abb01aed1c462a50 (patch)
tree834a0c621468568a6a55155f001e8318c91fe293 /Makefile
parent21dbe12c76e43735dc623067c1b09ef43519d9fc (diff)
parentfc675b8cd5ac102651c322e05d27c4fa7609f7a6 (diff)
downloadgit-f2fea68a0fc29c6378748853abb01aed1c462a50.tar.gz
Merge branch 'fk/blame'
* fk/blame: git-blame, take 2 Merge part of 'lt/rev-list' into 'fk/blame' Add git-blame, a tool for assigning blame.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a1ec04e3a0..b6d8804d4b 100644
--- a/Makefile
+++ b/Makefile
@@ -165,7 +165,7 @@ PROGRAMS = \
git-upload-pack$X git-verify-pack$X git-write-tree$X \
git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
- git-describe$X git-merge-tree$X
+ git-describe$X git-merge-tree$X git-blame$X
# what 'all' will build and 'install' will install, in gitexecdir
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)