summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-11-26 22:51:38 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-11-26 22:51:38 -0800
commit3c23bea8ac211332086d26c90cd7348d6d0e129f (patch)
tree45707725a5a4a85e8f2777e8443ec03b6e10f0e9 /Makefile
parentMerge branch 'jc/push-delete-ref' (diff)
parentgit-shortlog: make common repository prefix configurable with .mailmap (diff)
downloadtgif-3c23bea8ac211332086d26c90cd7348d6d0e129f.tar.xz
Merge branch 'js/shortlog'
* js/shortlog: git-shortlog: make common repository prefix configurable with .mailmap git-shortlog: fix common repository prefix abbreviation. builtin git-shortlog is broken shortlog: fix "-n" shortlog: handle email addresses case-insensitively shortlog: read mailmap from ./.mailmap again shortlog: do not crash on parsing "[PATCH" Build in shortlog
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index fc30dcbbb9..de3e9f38ec 100644
--- a/Makefile
+++ b/Makefile
@@ -171,7 +171,7 @@ SCRIPT_SH = \
SCRIPT_PERL = \
git-archimport.perl git-cvsimport.perl git-relink.perl \
- git-shortlog.perl git-rerere.perl \
+ git-rerere.perl \
git-cvsserver.perl \
git-svnimport.perl git-cvsexportcommit.perl \
git-send-email.perl git-svn.perl
@@ -287,6 +287,7 @@ BUILTIN_OBJS = \
builtin-rev-parse.o \
builtin-rm.o \
builtin-runstatus.o \
+ builtin-shortlog.o \
builtin-show-branch.o \
builtin-stripspace.o \
builtin-symbolic-ref.o \