summaryrefslogtreecommitdiffstats
path: root/git-shortlog.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-12-24 19:31:39 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-12-24 19:31:39 +0000
commit0ec429328154e4d8268651eca7997f99514ece21 (patch)
tree50497506cd32dc991b88c5ed308d0d3dd959dcf9 /git-shortlog.txt
parentf556fc2a7c28ca2b4097c2c8b0180de3b8ca7238 (diff)
downloadgit-htmldocs-0ec429328154e4d8268651eca7997f99514ece21.tar.gz
Autogenerated HTML docs for v1.5.4-rc1-23-g3a96
Diffstat (limited to 'git-shortlog.txt')
-rw-r--r--git-shortlog.txt19
1 files changed, 10 insertions, 9 deletions
diff --git a/git-shortlog.txt b/git-shortlog.txt
index e14720b73..36510a845 100644
--- a/git-shortlog.txt
+++ b/git-shortlog.txt
@@ -38,15 +38,16 @@ OPTIONS
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)>
+If the file `.mailmap` 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
------