| commit | 0a2142507220d02abfe63794baa947791ae766d1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Feb 2012 23:56:27 +0000 (6 15:56 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Feb 2012 23:56:27 +0000 (6 15:56 -0800) | ||
| tree | 7a5d8294787f9aca6726f508e801f09f7ba587a9 | treesnapshot (tar.gz zip) |
| parent | c94dd129ee4a4b552110fd2496898901f6b69142 | commitdiff |
| parent | f026358ef20e0c252388a41fcc8eff125b00927c | commitdiff |
Merge branch 'jc/maint-mailmap-output' into next
* jc/maint-mailmap-output:
mailmap: always return a plain mail address from map_user()
* jc/maint-mailmap-output:
mailmap: always return a plain mail address from map_user()