diff options
| author | Marius Storm-Olsen <marius@trolltech.com> | 2009-02-08 15:34:27 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-08 12:36:26 -0800 |
| commit | d551a488169aeb2ac09dba781f2ffbecf3425996 (patch) | |
| tree | 04a6e379953fbabdbe17dddd8732f778b20cec84 /builtin-blame.c | |
| parent | 88ccb9f9745ff1f44bff7c6d6c17ad4b46870706 (diff) | |
| download | git-d551a488169aeb2ac09dba781f2ffbecf3425996.tar.gz | |
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>
Diffstat (limited to 'builtin-blame.c')
| -rw-r--r-- | builtin-blame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index aae14ef8bb..19edcf33b1 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -2394,7 +2394,7 @@ parse_done: die("reading graft file %s failed: %s", revs_file, strerror(errno)); - read_mailmap(&mailmap, ".mailmap", NULL); + read_mailmap(&mailmap, NULL); if (!incremental) setup_pager(); |