{"thread":{"id":"29087","subject":"[PATCH] Documentation: fix formatting error in merge-options.txt","startedAt":"2011-12-05T07:53:27Z","lastAt":"2011-12-05T19:16:28Z","messageCount":2,"participants":["Jack Nagel","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"180304","messageId":"1323071607-29213-1-git-send-email-jacknagel@gmail.com","threadId":"29087","inReplyTo":null,"subject":"[PATCH] Documentation: fix formatting error in merge-options.txt","fromName":"Jack Nagel","fromEmail":"jacknagel@gmail.com","sentAt":"2011-12-05T07:53:27Z","receivedAt":"2011-12-05T07:53:27Z","isPatch":true,"sender":{"key":"jacknagel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/568243?v=4"},"body":"The first paragraph inside of a list item does not need a preceding line\nconsisting of a single '+', and in fact this causes the text to be\nmisrendered. Fix it.\n\nSigned-off-by: Jack Nagel <jacknagel@gmail.com>\n---\n Documentation/merge-options.txt |    1 -\n 1 files changed, 0 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\nindex 6bd0b04..1a5c12e 100644\n--- a/Documentation/merge-options.txt\n+++ b/Documentation/merge-options.txt\n@@ -9,7 +9,6 @@ inspect and further tweak the merge result before committing.\n \n --edit::\n -e::\n-+\n \tInvoke editor before committing successful merge to further\n \tedit the default merge message.\n \n-- \n1.7.8\n"},{"id":"180310","messageId":"7v4nxen81f.fsf@alter.siamese.dyndns.org","threadId":"29087","inReplyTo":"1323071607-29213-1-git-send-email-jacknagel@gmail.com","subject":"Re: [PATCH] Documentation: fix formatting error in merge-options.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-12-05T19:16:28Z","receivedAt":"2011-12-05T19:16:28Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jack Nagel <jacknagel@gmail.com> writes:\n\n> The first paragraph inside of a list item does not need a preceding line\n> consisting of a single '+', and in fact this causes the text to be\n> misrendered. Fix it.\n\nThanks.\n\n>\n> Signed-off-by: Jack Nagel <jacknagel@gmail.com>\n> ---\n>  Documentation/merge-options.txt |    1 -\n>  1 files changed, 0 insertions(+), 1 deletions(-)\n>\n> diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\n> index 6bd0b04..1a5c12e 100644\n> --- a/Documentation/merge-options.txt\n> +++ b/Documentation/merge-options.txt\n> @@ -9,7 +9,6 @@ inspect and further tweak the merge result before committing.\n>  \n>  --edit::\n>  -e::\n> -+\n>  \tInvoke editor before committing successful merge to further\n>  \tedit the default merge message.\n"}]}