index af68d694a0ad8066b05fcc02bae8e57a7c137034..d05f324462d23f64ba9563666e555a9eee3c443f 100644 (file)
include::merge-options.txt[]
-m <msg>::
include::merge-options.txt[]
-m <msg>::
- The commit message to be used for the merge commit (in case
- it is created). The 'git-fmt-merge-msg' script can be used
- to give a good default for automated 'git-merge' invocations.
+ Set the commit message to be used for the merge commit (in
+ case one is created). The 'git fmt-merge-msg' command can be
+ used to give a good default for automated 'git merge'
+ invocations.
<remote>...::
Other branch heads to merge into our branch. You need at
<remote>...::
Other branch heads to merge into our branch. You need at
branch.<name>.mergeoptions::
Sets default options for merging into branch <name>. The syntax and
branch.<name>.mergeoptions::
Sets default options for merging into branch <name>. The syntax and
- supported options are equal to that of 'git-merge', but option values
- containing whitespace characters are currently not supported.
+ supported options are the same as those of 'git merge', but option
+ values containing whitespace characters are currently not supported.
HOW MERGE WORKS
---------------
HOW MERGE WORKS
---------------