Merge branch 'dg/subtree-fixes'

diff --git a/Documentation/mailmap.txt b/Documentation/mailmap.txt
index dd89fca3f8996e119ce9d0cec0a6d9fc6616525d..4a8c276529a574355185adf3c77dede6fbd94267 100644 (file)
--- 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.