# [PATCH] Fix a formatting error in git-merge.txt 2 messages from 2010-10-29 to 2010-10-29. Participants: Nathan W. Panike, Jonathan Nieder. Thread: https://gitlist.dev/t/25592 ## Nathan W. Panike, 2010-10-29 15:33 Subject: [PATCH] Fix a formatting error in git-merge.txt Message-ID: <4ccaebae.e91dec0a.1ac5.ffff8876@mx.google.com> URL: https://gitlist.dev/e/4ccaebae.e91dec0a.1ac5.ffff8876%40mx.google.com ``` Signed-off-by: Nathan W. Panike --- Without this patch, the lines below get set in typewriter mode, which just looks wrong. Documentation/git-merge.txt | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 84043cc..d43416d 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -59,13 +59,13 @@ include::merge-options.txt[] -m :: Set the commit message to be used for the merge commit (in case one is created). - - If `--log` is specified, a shortlog of the commits being merged - will be appended to the specified message. - - The 'git fmt-merge-msg' command can be - used to give a good default for automated 'git merge' - invocations. ++ +If `--log` is specified, a shortlog of the commits being merged +will be appended to the specified message. ++ +The 'git fmt-merge-msg' command can be +used to give a good default for automated 'git merge' +invocations. --rerere-autoupdate:: --no-rerere-autoupdate:: -- 1.7.3.2.148.g04a2.dirty ``` ## Jonathan Nieder, 2010-10-29 15:57 Subject: Re: [PATCH] Fix a formatting error in git-merge.txt Message-ID: <20101029155743.GA28839@burratino> URL: https://gitlist.dev/e/20101029155743.GA28839%40burratino In-Reply-To: <4ccaebae.e91dec0a.1ac5.ffff8876@mx.google.com> ``` (+cc: Ram, Junio) Hi, Nathan W. Panike wrote: > Signed-off-by: Nathan W. Panike > --- > Without this patch, the lines below get set in typewriter mode, which > just looks wrong. This part belongs above the "---" line, so future generations can learn the reason for the patch (and thus avoid undoing it when considering future changes). > Documentation/git-merge.txt | 14 +++++++------- > 1 files changed, 7 insertions(+), 7 deletions(-) Thanks. The patch proper looks good to me. Regards, Jonathan ```