Autogenerated man pages for v1.4.0-rc1-gfd7e

[git.git] / man1 / git-shortlog.1

diff --git a/man1/git-shortlog.1 b/man1/git-shortlog.1
index dc30578..360ac39 100755 (executable)
--- a/man1/git-shortlog.1
+++ b/man1/git-shortlog.1
@@ -28,7 +28,22 @@ git\-log \-\-pretty=short | \fIgit\-shortlog\fR
 .SH "DESCRIPTION"
 
 
-Summarizes \fIgit log\fR output in a format suitable for inclusion in release announcements\&.
+Summarizes \fIgit log\fR output in a format suitable for inclusion 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\&.
+
+.SH "FILES"
+
+.TP
+\fI\&.mailmap\fR
+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 \fI<\fR and \fI>\fR\&. Use hash \fI#\fR for comments\&. Example:
+
+.nf
+# Keep alphabetized
+Adam Morrow <adam@localhost\&.localdomain>
+Eve Jones <eve@laptop\&.(none)>
+.fi
 
 .SH "AUTHOR"