Skip to content

Commit ba4c32b

Browse files
hendebygitster
authored andcommitted
shortlog manpage documentation: work around asciidoc markup issues
We wanted to have a list in which one (and the sole, as it happen to be) item in it is ".mailmap", but do not seem to be able to convince AsciiDoc to format it correctly for manpages. Reformat it into a paragraph that describes the said file to work around the issue. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 0e545f7 commit ba4c32b

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

Documentation/git-shortlog.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,16 @@ OPTIONS
3838
FILES
3939
-----
4040

41-
.mailmap::
42-
If this file exists, it will be used for mapping author email
43-
addresses to a real author name. One mapping per line, first
44-
the author name followed by the email address enclosed by
45-
'<' and '>'. Use hash '#' for comments. Example:
46-
47-
# Keep alphabetized
48-
Adam Morrow <adam@localhost.localdomain>
49-
Eve Jones <eve@laptop.(none)>
41+
If the file `.mailmap` exists, it will be used for mapping author
42+
email addresses to a real author name. One mapping per line, first
43+
the author name followed by the email address enclosed by
44+
'<' and '>'. Use hash '#' for comments. Example:
45+
46+
------------
47+
# Keep alphabetized
48+
Adam Morrow <adam@localhost.localdomain>
49+
Eve Jones <eve@laptop.(none)>
50+
------------
5051

5152
Author
5253
------

0 commit comments

Comments
 (0)