kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Fix a formatting error in git-merge.txt 

Inside an element of an enumerated list, the second and subsequent
paragraphs need to lose their indent and have to be strung together with a
line with a single '+' on it instead.  Otherwise the lines below are shown
in typewriter face, which just looks wrong.

Signed-off-by: Nathan W. Panike <nathan.panike@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nathan W. Panike 2010-10-29 10:33:54 -05:00 committed by Junio C Hamano
parent c3fced6498
commit af77aee9ca
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/git-merge.txt
View File

@ -59,13 +59,13 @@ include::merge-options.txt[]
-m <msg>:: -m <msg>::
Set the commit message to be used for the merge commit (in Set the commit message to be used for the merge commit (in
case one is created). case one is created).

+
If `--log` is specified, a shortlog of the commits being merged If `--log` is specified, a shortlog of the commits being merged
will be appended to the specified message. will be appended to the specified message.

+
The 'git fmt-merge-msg' command can be The 'git fmt-merge-msg' command can be
used to give a good default for automated 'git merge' used to give a good default for automated 'git merge'
invocations. invocations.


--rerere-autoupdate:: --rerere-autoupdate::
--no-rerere-autoupdate:: --no-rerere-autoupdate::