2 commits

Author	SHA1	Message	Date
Marius Storm-Olsen	d20d654fe8	Change current mailmap usage to do matching on both name and email of author/committer. ... Signed-off-by: Marius Storm-Olsen <marius@trolltech.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2009-02-08 12:36:54 -08:00
Marius Storm-Olsen	d551a48816	Add mailmap.file as configurational option for mailmap location ... This allows us to augment the repo mailmap file, and to use mailmap files elsewhere than the repository root. Meaning that the entries in mailmap.file will override the entries in "./.mailmap", should they match. Signed-off-by: Marius Storm-Olsen <marius@trolltech.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2009-02-08 12:36:26 -08:00