Merge branch 'ap/commit-author-mailmap'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Sep 2013 18:38:33 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Sep 2013 18:38:33 +0000 (11:38 -0700)
commit5aebc9a8deb1c8c83537bae72f14585e44f51787
tree14ec3c578337afe2f8ac7d58285e532eb41821df
parentb8f23112f0415cc86eb0ec576ac7e16c7c9d78b8
parentea16794e4303e79f8acb01a93fb6b1762972ab86
Merge branch 'ap/commit-author-mailmap'

"git commit --author=$name", when $name is not in the canonical
"A. U. Thor <au.thor@example.xz>" format, looks for a matching name
from existing history, but did not consult mailmap to grab the
preferred author name.

* ap/commit-author-mailmap:
  commit: search author pattern against mailmap
builtin/commit.c
t/t4203-mailmap.sh