From 7d48e9e6f77d336376c1a554eeff0590f77e1ee1 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Sun, 8 Feb 2009 15:34:31 +0100 Subject: Move mailmap documentation into separate file Include it directly from git-shortlog.txt, and refer to it from pretty-format.txt. Signed-off-by: Marius Storm-Olsen Signed-off-by: Junio C Hamano --- Documentation/git-blame.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Documentation/git-blame.txt') diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index fba374d65..6999cf2a6 100644 --- 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] -- cgit v1.2.1