diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-10-10 00:56:29 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-10-10 00:56:29 +0000 |
| commit | c0e55e76f42a06dfbb4ede27d35f6bdb8cae1f01 (patch) | |
| tree | 3d14a6b26152cf3e014eafe48918109b2cc7cbf4 /git-merge.txt | |
| parent | 0e5cb1e4d7480845f839da2ee71c267ee054f758 (diff) | |
| download | git-htmldocs-c0e55e76f42a06dfbb4ede27d35f6bdb8cae1f01.tar.gz | |
Autogenerated HTML docs for v1.6.5-rc3-35-g3340
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/git-merge.txt b/git-merge.txt index af68d694a..d05f32446 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -28,9 +28,10 @@ OPTIONS 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 @@ -49,8 +50,8 @@ include::merge-config.txt[] 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 --------------- |