X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-shortlog.txt;h=7486ebe785733a6d4f4e1a3a2ea8f5c37b3f0a51;hb=74237d6236d7e32f69469ff26df3f3bb3875f523;hp=54fb922ba9704112f953e4f6de25f053e81b2097;hpb=34925d35ff278c7377e0cf3fce0227d5eceffeb5;p=git.git

diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index 54fb922b..7486ebe7 100644
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -5,7 +5,6 @@ NAME
 ----
 git-shortlog - Summarize 'git log' output
 
-
 SYNOPSIS
 --------
 git-log --pretty=short | 'git-shortlog'
@@ -13,8 +12,22 @@ git-log --pretty=short | 'git-shortlog'
 DESCRIPTION
 -----------
 Summarizes 'git log' output in a format suitable for inclusion
-in release announcements.
-
+in release announcements. Each commit will be grouped by author
+the first line of the commit message will be shown.
+
+Additionally, "[PATCH]" will be stripped from the commit description.
+
+FILES
+-----
+'.mailmap'::
+	If this file exists, it will be used for mapping author email
+	addresses to a real author name. One mapping per line, first
+	the author name followed by the email address enclosed by
+	'<' and '>'. Use hash '#' for comments. Example:
+
+		# Keep alphabetized
+		Adam Morrow <adam@localhost.localdomain>
+		Eve Jones <eve@laptop.(none)>
 
 Author
 ------