diff options
| author | Marius Storm-Olsen <marius@trolltech.com> | 2009-02-08 14:34:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-08 20:36:26 (GMT) |
| commit | d551a488169aeb2ac09dba781f2ffbecf3425996 (patch) | |
| tree | 04a6e379953fbabdbe17dddd8732f778b20cec84 /Documentation | |
| parent | 88ccb9f9745ff1f44bff7c6d6c17ad4b46870706 (diff) | |
| download | git-d551a488169aeb2ac09dba781f2ffbecf3425996.zip git-d551a488169aeb2ac09dba781f2ffbecf3425996.tar.gz git-d551a488169aeb2ac09dba781f2ffbecf3425996.tar.bz2 | |
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')
| -rw-r--r-- | Documentation/config.txt | 8 | ||||
| -rw-r--r-- | Documentation/git-shortlog.txt | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index e2b8775..6dd57bd 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1012,6 +1012,14 @@ log.showroot:: Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which normally hide the root commit will now show it. True by default. +mailmap.file:: + The location of an augmenting mailmap file. The default + mailmap, located in the root of the repository, is loaded + first, then the mailmap file pointed to by this variable. + The location of the mailmap file may be in a repository + subdirectory, or somewhere outside of the repository itself. + See linkgit:git-shortlog[1] and linkgit:git-blame[1]. + man.viewer:: Specify the programs that may be used to display help in the 'man' format. See linkgit:git-help[1]. diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index 498bd28..66b6045 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 |