Add mailmap.file as configurational option for mailmap location
commitd551a488169aeb2ac09dba781f2ffbecf3425996
authorMarius Storm-Olsen <marius@trolltech.com>
Sun, 8 Feb 2009 14:34:27 +0000 (8 15:34 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 8 Feb 2009 20:36:26 +0000 (8 12:36 -0800)
tree04a6e379953fbabdbe17dddd8732f778b20cec84
parent88ccb9f9745ff1f44bff7c6d6c17ad4b46870706
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>
Documentation/config.txt
Documentation/git-shortlog.txt
builtin-blame.c
builtin-shortlog.c
cache.h
config.c
mailmap.c
mailmap.h
pretty.c
t/t4203-mailmap.sh [new file with mode: 0755]