| commit | 1876166aaab56056083e6a61de4423d130d4dcc6 | |
| author | Ramkumar Ramachandra <artagnon@gmail.com> | |
| Wed, 8 Sep 2010 17:59:53 +0000 (8 23:29 +0530) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 9 Sep 2010 18:39:20 +0000 (9 11:39 -0700) | ||
| tree | 36aa247bd4c5ab3009ce3d8ee5837ad36ae34145 | treesnapshot (tar.gz zip) |
| parent | fdc4408a8980392f2cc30dc125906a61edf170ec | commitdiff |
fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
Give "shortlog_len" parameter to the fmt_merge_msg(), remove its
"merge_summary" parameter, and remove fmt_merge_msg_shortlog() function.
In the updated API, shortlog_len == 0 means no shortlog is given.
The parameter "merge_title" controls if the title of the merge commit is
autogenerated (it reads something like "Merge branch ..."), and typically
it is set to true when the caller does not give its own message.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Mentored-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Give "shortlog_len" parameter to the fmt_merge_msg(), remove its
"merge_summary" parameter, and remove fmt_merge_msg_shortlog() function.
In the updated API, shortlog_len == 0 means no shortlog is given.
The parameter "merge_title" controls if the title of the merge commit is
autogenerated (it reads something like "Merge branch ..."), and typically
it is set to true when the caller does not give its own message.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Mentored-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin.h | diffblobblamehistory | |
| builtin/fmt-merge-msg.c | diffblobblamehistory | |
| builtin/merge.c | diffblobblamehistory |