diff options
| author | Jeff King <peff@peff.net> | 2012-12-13 08:08:12 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-13 10:19:26 -0800 |
| commit | d5422b0c0ba9948166115f1b178c34ee65fc3057 (patch) | |
| tree | d877696149a8e18359ca6fe2af93ed4be7f030bc /Documentation/mailmap.txt | |
| parent | 938a60d64fc91fd7d646ed33fad527b724d1e534 (diff) | |
| download | git-d5422b0c0ba9948166115f1b178c34ee65fc3057.tar.gz git-d5422b0c0ba9948166115f1b178c34ee65fc3057.tar.xz | |
mailmap: fix some documentation loose-ends for mailmap.blob
Anywhere we mention mailmap.file, it is probably worth
mentioning mailmap.blob, as well.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/mailmap.txt')
| -rw-r--r-- | Documentation/mailmap.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/mailmap.txt b/Documentation/mailmap.txt index 288f04e70..bb349c2db 100644 --- a/Documentation/mailmap.txt +++ b/Documentation/mailmap.txt @@ -1,5 +1,6 @@ If the file `.mailmap` exists at the toplevel of the repository, or at -the location pointed to by the mailmap.file configuration option, it +the location pointed to by the mailmap.file or mailmap.blob +configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses. |