summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2010-09-08 17:59:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-09 18:39:20 (GMT)
commit1876166aaab56056083e6a61de4423d130d4dcc6 (patch)
tree36aa247bd4c5ab3009ce3d8ee5837ad36ae34145 /setup.c
parentfdc4408a8980392f2cc30dc125906a61edf170ec (diff)
downloadgit-1876166aaab56056083e6a61de4423d130d4dcc6.zip
git-1876166aaab56056083e6a61de4423d130d4dcc6.tar.gz
git-1876166aaab56056083e6a61de4423d130d4dcc6.tar.bz2
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>
Diffstat (limited to 'setup.c')
0 files changed, 0 insertions, 0 deletions