{"thread":{"id":"25592","subject":"[PATCH] Fix a formatting error in git-merge.txt","startedAt":"2010-10-29T15:33:54Z","lastAt":"2010-10-29T15:57:43Z","messageCount":2,"participants":["Nathan W. Panike","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"154785","messageId":"4ccaebae.e91dec0a.1ac5.ffff8876@mx.google.com","threadId":"25592","inReplyTo":null,"subject":"[PATCH] Fix a formatting error in git-merge.txt","fromName":"Nathan W. Panike","fromEmail":"nathan.panike@gmail.com","sentAt":"2010-10-29T15:33:54Z","receivedAt":"2010-10-29T15:33:54Z","isPatch":true,"sender":{"key":"nathan.panike@gmail.com","avatar":"https://avatars.githubusercontent.com/u/389447?v=4"},"body":"Signed-off-by: Nathan W. Panike <nathan.panike@gmail.com>\n---\nWithout this patch, the lines below get set in typewriter mode, which\njust looks wrong.\n\n Documentation/git-merge.txt |   14 +++++++-------\n 1 files changed, 7 insertions(+), 7 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 84043cc..d43416d 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -59,13 +59,13 @@ include::merge-options.txt[]\n -m <msg>::\n \tSet the commit message to be used for the merge commit (in\n \tcase one is created).\n-\n-\tIf `--log` is specified, a shortlog of the commits being merged\n-\twill be appended to the specified message.\n-\n-\tThe 'git fmt-merge-msg' command can be\n-\tused to give a good default for automated 'git merge'\n-\tinvocations.\n++\n+If `--log` is specified, a shortlog of the commits being merged\n+will be appended to the specified message.\n++\n+The 'git fmt-merge-msg' command can be\n+used to give a good default for automated 'git merge'\n+invocations.\n \n --rerere-autoupdate::\n --no-rerere-autoupdate::\n-- \n1.7.3.2.148.g04a2.dirty\n"},{"id":"154786","messageId":"20101029155743.GA28839@burratino","threadId":"25592","inReplyTo":"4ccaebae.e91dec0a.1ac5.ffff8876@mx.google.com","subject":"Re: [PATCH] Fix a formatting error in git-merge.txt","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-10-29T15:57:43Z","receivedAt":"2010-10-29T15:57:43Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"(+cc: Ram, Junio)\n\nHi,\n\nNathan W. Panike wrote:\n\n> Signed-off-by: Nathan W. Panike <nathan.panike@gmail.com>\n> ---\n> Without this patch, the lines below get set in typewriter mode, which\n> just looks wrong.\n\nThis part belongs above the \"---\" line, so future generations can\nlearn the reason for the patch (and thus avoid undoing it when\nconsidering future changes).\n\n>  Documentation/git-merge.txt |   14 +++++++-------\n>  1 files changed, 7 insertions(+), 7 deletions(-)\n\nThanks.  The patch proper looks good to me.\n\nRegards,\nJonathan\n"}]}