From: Gustaf Hendeby <hendeby@isy.liu.se>
To: peff@peff.net, gitster@pobox.com
Cc: git@vger.kernel.org, Gustaf Hendeby <hendeby@isy.liu.se>
Subject: [PATCH] Fix for missing line in man page rendered for git shortlog
Date: Sun, 23 Dec 2007 19:34:51 +0100 [thread overview]
Message-ID: <1198434891-25847-1-git-send-email-hendeby@isy.liu.se> (raw)
In-Reply-To: <20071223171840.GA8799@sigill.intra.peff.net>
This is a work around for a asciidoc/xmlto problem with lines starting
with a '.'. Until a proper fix for this is found, rewrite problematic
sections.
Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
Acked-by: Jeff King <peff@peff.net>
---
Jeff King wrote:
> On Sun, Dec 23, 2007 at 03:16:00PM +0100, Gustaf Hendeby wrote:
>
> I mentioned this same issue a few weeks ago:
>
> <20071211124220.GA17929@sigill.intra.peff.net>
Ah, I missed that one. Unfortunately, the lack of answers indicate it isn't
trivial to find a general fix to the problem. :(
> I think re-wording is a fine fix, at least for now.
>
>> Something like this (would we then like to reindent this? it would make the
>> change look much bigger), which seems to work with my asciidoc version:
>
> If by "reindent" you mean not just "wrap the long line" but "the whole
> paragraph should start at the beginning of the line, since it's no
> longer part of the list element", then
>
> Acked-by: Jeff King <peff@peff.net>
I hope I understood corretly when I added your ACK to the patch.
Thanks,
Gustaf
Documentation/git-shortlog.txt | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index e14720b..854bf7a 100644
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -37,16 +37,14 @@ 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
------
--
1.5.4.rc1.22.g4b71
next prev parent reply other threads:[~2007-12-23 18:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-23 14:16 Problem with git shortlog documentation Gustaf Hendeby
2007-12-23 17:18 ` Jeff King
2007-12-23 18:28 ` Junio C Hamano
2007-12-23 18:34 ` Gustaf Hendeby [this message]
2007-12-23 18:46 ` [PATCH] Fix for missing line in man page rendered for git shortlog Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1198434891-25847-1-git-send-email-hendeby@isy.liu.se \
--to=hendeby@isy.liu.se \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).