summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Frank Lichtenheld <frank@lichtenheld.de>2007-04-19 00:10:22 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2007-04-18 15:41:59 -0700
commit0ad64fd0b8d073e0c73836858a54f693c9191918 (patch)
tree38446f2bb1c4c633cf1955b7109ae0f825b6f9d6 /Documentation
parentFix overwriting of files when applying contextually independent diffs (diff)
downloadtgif-0ad64fd0b8d073e0c73836858a54f693c9191918.tar.xz
git-shortlog: Fix two formatting errors in asciidoc documentation
First use [verse] in the SYNOPSIS so that the line break actually shows. Secondly drop the quotes around '.mailmap' since this exposes a bug in our toolchain (didn't bother enough yet to find out wether it is asciidoc's fault or that of the XSL templates) that leads to the dot not getting escaped correctly in the roff output and thereby swallowing the line. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-shortlog.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index b0df92e819..1c8c55ef6e 100644
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -7,6 +7,7 @@ git-shortlog - Summarize 'git log' output
SYNOPSIS
--------
+[verse]
git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s]
git-shortlog [-n|--number] [-s|--summary] [<committish>...]
@@ -33,7 +34,8 @@ OPTIONS
FILES
-----
-'.mailmap'::
+
+.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