Code

Merge branch 'js/maint-pretty-mailmap' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2008 22:27:03 +0000 (15:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2008 22:27:03 +0000 (15:27 -0700)
commit013942f637e2e0706b5a44e58a9d285bc57c5305
treef9919df4ac540b042a57bb1a5cd16fc139f53517
parentc9784cd0c8576ccbacb3d7dd14000d0892c3fdf6
parente0cbc39768884a1e7edcf2dbf6e6825c4b23485a
Merge branch 'js/maint-pretty-mailmap' into maint

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