X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-shortlog.txt;h=7486ebe785733a6d4f4e1a3a2ea8f5c37b3f0a51;hb=HEAD;hp=a852e9b865b24aba71d7a0e79e237d21c19746ca;hpb=348c4c66dacb1810a9bcd592e72f98a465233488;p=git.git

diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index a852e9b8..7486ebe7 100644
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -1,21 +1,33 @@
 git-shortlog(1)
 ===============
-v0.99.4, Aug 2005
 
 NAME
 ----
-git-shortlog - Summarize 'git log' output.
-
+git-shortlog - Summarize 'git log' output
 
 SYNOPSIS
 --------
-'git log --pretty=short | git shortlog'
+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
 ------