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 /Documentation/git-shortlog.txt | |
| parent | Merge branch 'jc/fsck' (early part) (diff) | |
| download | tgif-d551a488169aeb2ac09dba781f2ffbecf3425996.tar.xz | |
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 'Documentation/git-shortlog.txt')
| -rw-r--r-- | Documentation/git-shortlog.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index 498bd28929..66b6045849 100644 --- a/Documentation/git-shortlog.txt +++ b/Documentation/git-shortlog.txt @@ -48,7 +48,8 @@ OPTIONS FILES ----- -If a file `.mailmap` exists at the toplevel of the repository, +If a file `.mailmap` exists at the toplevel of the repository, or at the +location pointed to by the log.mailmap configuration option, it is used to map an author email address to a canonical real name. This can be used to coalesce together commits by the same person where their name was spelled differently (whether with the same email address or |