diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-06-19 00:33:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-06-19 00:33:17 +0000 |
| commit | f5de4cf4e1e8bccd17515d71186e752f4716cac9 (patch) | |
| tree | ab2db92276d37478b5b109d568c3726bac9f405c /git-merge.txt | |
| parent | 4b7af1106d18fbf957f1f7257d099d47d2fa775f (diff) | |
| download | git-htmldocs-f5de4cf4e1e8bccd17515d71186e752f4716cac9.tar.gz | |
Autogenerated HTML docs for v1.7.1-422-g049e9
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index c2325ef90..84043cc5b 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -58,7 +58,12 @@ include::merge-options.txt[] -m <msg>:: Set the commit message to be used for the merge commit (in - case one is created). The 'git fmt-merge-msg' command can be + 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. |