summaryrefslogtreecommitdiff
path: root/Documentation/git-blame.txt
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius@trolltech.com>2009-02-08 15:34:31 +0100
committerJunio C Hamano <gitster@pobox.com>2009-02-08 12:38:08 -0800
commit7d48e9e6f77d336376c1a554eeff0590f77e1ee1 (patch)
tree0b417a815a62150e164ba0b237195ae89153c78b /Documentation/git-blame.txt
parentd20d654fe8923a502527547b17fe284d15d6aec9 (diff)
downloadgit-7d48e9e6f77d336376c1a554eeff0590f77e1ee1.tar.gz
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 <marius@trolltech.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-blame.txt')
-rw-r--r--Documentation/git-blame.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index fba374d652..6999cf2a65 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]