summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 18:24:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-22 18:24:14 (GMT)
commite683889b75a32b8c2bf11c8fa0cf851087bc5415 (patch)
tree60f3aa50981c9dc2888fb734df1103d40342d3a1 /Makefile
parent988f98f61fc80021311c2d161084c03a55f7354d (diff)
parentcb5c9521f1e41aa536c2cf64d689e647d035bb90 (diff)
downloadgit-e683889b75a32b8c2bf11c8fa0cf851087bc5415.zip
git-e683889b75a32b8c2bf11c8fa0cf851087bc5415.tar.gz
git-e683889b75a32b8c2bf11c8fa0cf851087bc5415.tar.bz2
Merge branch 'es/check-mailmap'
A new command to allow scripts to query the mailmap information. * es/check-mailmap: t4203: test check-mailmap command invocation builtin: add git-check-mailmap command
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 0600eb4..ef442eb 100644
--- a/Makefile
+++ b/Makefile
@@ -912,6 +912,7 @@ BUILTIN_OBJS += builtin/bundle.o
BUILTIN_OBJS += builtin/cat-file.o
BUILTIN_OBJS += builtin/check-attr.o
BUILTIN_OBJS += builtin/check-ignore.o
+BUILTIN_OBJS += builtin/check-mailmap.o
BUILTIN_OBJS += builtin/check-ref-format.o
BUILTIN_OBJS += builtin/checkout-index.o
BUILTIN_OBJS += builtin/checkout.o