undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Fix a formatting error in git-merge.txt
This commit is contained in:
Junio C Hamano 2010-11-05 10:36:49 -07:00
commit 31731b0ea4
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::