Merge branch 'fk/blame' into next

* fk/blame: Add git-blame, a tool for assigning blame.
git-mirror · Feb 21, 2006 · 77e56ac · 77e56ac
2 parents deddce6 + cbfb73d
commit 77e56ac
Show file tree

Hide file tree

Showing 2 changed files with 444 additions and 1 deletion.
diff --git 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)