Merge branch 'es/check-mailmap'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:24:14 +0000 (22 11:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:24:14 +0000 (22 11:24 -0700)
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

1  2 
.gitignore
Makefile
contrib/completion/git-completion.bash
git.c
t/t4203-mailmap.sh

diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge
diff --cc git.c
Simple merge
Simple merge