* [PATCH] Documentation: fix formatting error in merge-options.txt
@ 2011-12-05 7:53 Jack Nagel
2011-12-05 19:16 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Jack Nagel @ 2011-12-05 7:53 UTC (permalink / raw)
To: git, gitster; +Cc: jacknagel
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.
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.
--
1.7.8
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Documentation: fix formatting error in merge-options.txt
2011-12-05 7:53 [PATCH] Documentation: fix formatting error in merge-options.txt Jack Nagel
@ 2011-12-05 19:16 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2011-12-05 19:16 UTC (permalink / raw)
To: Jack Nagel; +Cc: git, Jay Soffian
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-05 19:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).