diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-12 00:46:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-12 00:46:06 -0700 |
| commit | 66d0ff1bd35530f84c2b73e2b0e367637805217a (patch) | |
| tree | 6a32fc84dffe46a587b12e3d3b69436f5ede8a72 /Makefile | |
| parent | d15c55aa052434aee75c73da4ed771af3e3b6f61 (diff) | |
| parent | b24642b2f27b2cf01f6e726d816a2a1f5955ae3e (diff) | |
| download | git-66d0ff1bd35530f84c2b73e2b0e367637805217a.tar.gz | |
Merge branch 'jc/blame' into jc/web-blame
* jc/blame:
blame: Document and add help text for -f, -n, and -p
Remove git-annotate.perl and create a builtin-alias for git-blame
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -175,7 +175,7 @@ SCRIPT_SH = \ SCRIPT_PERL = \ git-archimport.perl git-cvsimport.perl git-relink.perl \ git-shortlog.perl git-rerere.perl \ - git-annotate.perl git-cvsserver.perl \ + git-cvsserver.perl \ git-svnimport.perl git-cvsexportcommit.perl \ git-send-email.perl git-svn.perl @@ -267,6 +267,7 @@ LIB_OBJS = \ BUILTIN_OBJS = \ builtin-add.o \ + builtin-annotate.o \ builtin-apply.o \ builtin-archive.o \ builtin-cat-file.o \ |