aboutsummaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 11:24:14 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-22 11:24:14 -0700
commite683889b75a32b8c2bf11c8fa0cf851087bc5415 (patch)
tree60f3aa50981c9dc2888fb734df1103d40342d3a1 /git.c
parent988f98f61fc80021311c2d161084c03a55f7354d (diff)
parentcb5c9521f1e41aa536c2cf64d689e647d035bb90 (diff)
downloadgit-e683889b75a32b8c2bf11c8fa0cf851087bc5415.tar.gz
git-e683889b75a32b8c2bf11c8fa0cf851087bc5415.tar.xz
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 'git.c')
-rw-r--r--git.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/git.c b/git.c
index 6104d5eef..2025f77d0 100644
--- a/git.c
+++ b/git.c
@@ -324,6 +324,7 @@ static void handle_internal_command(int argc, const char **argv)
{ "cat-file", cmd_cat_file, RUN_SETUP },
{ "check-attr", cmd_check_attr, RUN_SETUP },
{ "check-ignore", cmd_check_ignore, RUN_SETUP | NEED_WORK_TREE },
+ { "check-mailmap", cmd_check_mailmap, RUN_SETUP },
{ "check-ref-format", cmd_check_ref_format },
{ "checkout", cmd_checkout, RUN_SETUP | NEED_WORK_TREE },
{ "checkout-index", cmd_checkout_index,