![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 15 Feb 2009 09:44:15 +0000 (01:44 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 15 Feb 2009 09:44:15 +0000 (01:44 -0800) | ||
| commit | 160d2bc35382fb23beb99457e9111d15554bf223 | |
| tree | ec3722d8676e73f69c0ab172cf44a06c7aac5fc6 | tree | snapshot |
| parent | 2a8644c7f163e4b76a36739ba936f8d5d91c3cf4 | commit | diff |
| parent | 7d48e9e6f77d336376c1a554eeff0590f77e1ee1 | commit | diff |
Merge branch 'ms/mailmap'
* 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
* 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
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| builtin-blame.c | diff1 | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| pretty.c | diff1 | | diff2 | | blob | history |