Merge branch 'ms/mailmap'
authorJunio C Hamano <gitster@pobox.com>
Sun, 15 Feb 2009 09:44:15 +0000 (01:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 15 Feb 2009 09:44:15 +0000 (01:44 -0800)
* ms/mailmap:
Move mailmap documentation into separate file
Change current mailmap usage to do matching on both name and email of author/committer.
Add map_user() and clear_mailmap() to mailmap
Add find_insert_index, insert_at_index and clear_func functions to string_list
Add mailmap.file as configurational option for mailmap location

No differences found