parse-opt: migrate builtin-ls-files.

diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 34b24a3cad2309486c06e29e0e45c429388d0319..6999cf2a65723af963e087f57bf4f8bbd1a9350e 100644 (file)
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -184,13 +184,19 @@ 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]
 
 AUTHOR
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 GIT
 ---