diff options
| author | Tay Ray Chuan <rctay89@gmail.com> | 2010-05-11 01:17:52 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-10 12:02:20 -0700 |
| commit | f0ecac2b70bf6b44b89dfa493abd2f544010b1eb (patch) | |
| tree | 2fd6c98705ae583f32b25d9ee36567e5a2554b65 /Documentation/git-merge.txt | |
| parent | 8c6bdfdf8ba9a3d7a03d64b7a98305a460921130 (diff) | |
| download | git-f0ecac2b70bf6b44b89dfa493abd2f544010b1eb.tar.gz | |
merge: --log appends shortlog to message if specified
When the user specifies a message, use fmt_merge_msg_shortlog() to
append the shortlog.
Previously, when a message was specified, we ignored the merge title
("Merge <foo> into <bar>") and shortlog from fmt_merge_msg().
Update the documentation for -m to reflect this too.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index c2325ef90e..84043cc5b2 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/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. |