author | Junio C Hamano <gitster@pobox.com> | |
Fri, 5 Nov 2010 17:36:49 +0000 (10:36 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 5 Nov 2010 17:36:49 +0000 (10:36 -0700) |
* maint:
Fix a formatting error in git-merge.txt
Fix a formatting error in git-merge.txt
Documentation/git-merge.txt | patch | blob | history |
index 84043cc5b26db7d34c93a70ec005df913c345d85..d43416d299a7c028a88e8ddce89536c2c64e65c9 100644 (file)
-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::