summaryrefslogtreecommitdiff
path: root/Documentation/mailmap.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/mailmap.txt')
-rw-r--r--Documentation/mailmap.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/mailmap.txt b/Documentation/mailmap.txt
index 288f04e70c..4a8c276529 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.
@@ -46,7 +47,7 @@ Jane Doe <jane@desktop.(none)>
Joe R. Developer <joe@example.com>
------------
-Note how there is no need for an entry for <jane@laptop.(none)>, because the
+Note how there is no need for an entry for `<jane@laptop.(none)>`, because the
real name of that author is already correct.
Example 2: Your repository contains commits from the following