diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-11-06 01:01:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-11-06 01:01:59 +0000 |
| commit | 68cf15a825368c926443c26a6516947fca3c1d39 (patch) | |
| tree | a587c9a51372746ddc3cdb08108bb14fb94a0488 /git-merge.txt | |
| parent | 39c7a69d994a13cbd5594bf2f5e65a0f21cc9bb9 (diff) | |
| download | git-htmldocs-68cf15a825368c926443c26a6516947fca3c1d39.tar.gz | |
Autogenerated HTML docs for v1.7.3.2-161-g3089c
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/git-merge.txt b/git-merge.txt index 84043cc5b..d43416d29 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -59,13 +59,13 @@ include::merge-options.txt[] -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:: |