Merge branch 'js/maint-pretty-mailmap'
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2008 01:59:04 +0000 (18:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2008 01:59:04 +0000 (18:59 -0700)
commitfab600ce2ed086ba87499ffe3c35c46f85e7ab61
treeee50aef079f3aaeb9094cf3bb70a545fe809cb4c
parent28ed6e7b321bee3dd7e4aa9c0ff7da64844136f6
parente0cbc39768884a1e7edcf2dbf6e6825c4b23485a
Merge branch 'js/maint-pretty-mailmap'

* js/maint-pretty-mailmap:
  Add pretty format %aN which gives the author name, respecting .mailmap