threads / patch / 29087

patchDocumentation: fix formatting error in merge-options.txt

Subject: [PATCH] Documentation: fix formatting error in merge-options.txt

## tl;dr

2 messages between Dec 5, 2011 and Dec 5, 2011. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Jack Nagel· Dec 5, 2011, 07:53 UTC · lore

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(-)

Show changes to Documentation/merge-options.txt +0 −1

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

Junio C Hamano· Dec 5, 2011, 19:16 UTC · re: Jack Nagel · lore

Re: [PATCH] Documentation: fix formatting error in merge-options.txt

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.

Show 17 quoted lines

>
> 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.