diff options
| author | Gustaf Hendeby <hendeby@isy.liu.se> | 2007-12-23 10:37:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-23 10:40:25 -0800 |
| commit | ba4c32bdd506841c3f73cdfce5e9fb6760afd02c (patch) | |
| tree | 64351174195649e3ce9b5a8d022d939bd71f1018 | |
| parent | 0e545f75169e2c260dfb4445203c23cafdfc76ef (diff) | |
| download | git-ba4c32bdd506841c3f73cdfce5e9fb6760afd02c.tar.gz | |
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>
| -rw-r--r-- | Documentation/git-shortlog.txt | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index e14720b73f..36510a8451 100644 --- a/Documentation/git-shortlog.txt +++ b/Documentation/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 ------ |