Merge branch 'jc/maint-1.6.0-read-tree-overlay'

diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index cc934e55c38902e1bac0964e134640c910b9de96..4ef54d660280c921913a61afe117968d51960ec3 100644 (file)
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -184,6 +184,12 @@ there is ever added information (like the commit encoding or extended
 commit commentary), a blame viewer won't ever care.
 
 
+MAPPING AUTHORS
+---------------
+
+include::mailmap.txt[]
+
+
 SEE ALSO
 --------
 linkgit:git-annotate[1]