diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-06 01:06:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-06 01:06:32 -0800 |
| commit | abad6da146b5fe8e34f22bcbf31be3cb3e9b08e0 (patch) | |
| tree | 85e1e4b4fcd9b473ecbe709db2d9262dc57ad21d /git-shortlog.html | |
| parent | 085534867cb82e0690945a1645554999bcfa542a (diff) | |
| download | git-htmldocs-abad6da146b5fe8e34f22bcbf31be3cb3e9b08e0.tar.gz | |
Autogenerated HTML docs for v1.8.1-151-g32238a
Diffstat (limited to 'git-shortlog.html')
| -rw-r--r-- | git-shortlog.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-shortlog.html b/git-shortlog.html index ba1651840..73f9b9b0c 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -849,7 +849,8 @@ reference to the current repository.</p></div> person in the shortlog, where their name and/or email address was
spelled differently.</p></div>
<div class="paragraph"><p>If the file <code>.mailmap</code> 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.</p></div>
<div class="paragraph"><p>In the simple form, each line in the file consists of the canonical
|