From: Junio C Hamano <gitster@pobox.com>
To: Jack Nagel <jacknagel@gmail.com>
Cc: git@vger.kernel.org, Jay Soffian <jaysoffian@gmail.com>
Subject: Re: [PATCH] Documentation: fix formatting error in merge-options.txt
Date: Mon, 05 Dec 2011 11:16:28 -0800 [thread overview]
Message-ID: <7v4nxen81f.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1323071607-29213-1-git-send-email-jacknagel@gmail.com> (Jack Nagel's message of "Mon, 5 Dec 2011 01:53:27 -0600")
Jack Nagel <jacknagel@gmail.com> writes:
> The first paragraph inside of a list item does not need a preceding line
> consisting of a single '+', and in fact this causes the text to be
> misrendered. Fix it.
Thanks.
>
> Signed-off-by: Jack Nagel <jacknagel@gmail.com>
> ---
> Documentation/merge-options.txt | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
> index 6bd0b04..1a5c12e 100644
> --- a/Documentation/merge-options.txt
> +++ b/Documentation/merge-options.txt
> @@ -9,7 +9,6 @@ inspect and further tweak the merge result before committing.
>
> --edit::
> -e::
> -+
> Invoke editor before committing successful merge to further
> edit the default merge message.
prev parent reply other threads:[~2011-12-05 19:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-05 7:53 [PATCH] Documentation: fix formatting error in merge-options.txt Jack Nagel
2011-12-05 19:16 ` Junio C Hamano [this message]
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=7v4nxen81f.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jacknagel@gmail.com \
--cc=jaysoffian@gmail.com \
/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).