summaryrefslogtreecommitdiff
path: root/Documentation/mailmap.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/mailmap.txt')
-rw-r--r--Documentation/mailmap.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/mailmap.txt b/Documentation/mailmap.txt
index dd89fca..4a8c276 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.