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 /rerere.c | |
| parent | fmt-merge-msg: add function to append shortlog only (diff) | |
| download | tgif-f0ecac2b70bf6b44b89dfa493abd2f544010b1eb.tar.xz | |
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 'rerere.c')
0 files changed, 0 insertions, 0 deletions