[PATCH] Fix a formatting error in git-merge.txt

Nathan W. Panike· Oct 29, 2010, 15:33 UTC · lore

Signed-off-by: Nathan W. Panike <nathan.panike@gmail.com>
---
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(-)

Show changes to Documentation/git-merge.txt +7 −7

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 <msg>::
 	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· Oct 29, 2010, 15:57 UTC · re: Nathan W. Panike · lore

Re: [PATCH] Fix a formatting error in git-merge.txt

(+cc: Ram, Junio)

Hi,

Nathan W. Panike wrote:

> Signed-off-by: Nathan W. Panike <nathan.panike@gmail.com>
> ---
> 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

patchFix a formatting error in git-merge.txt