delta/git.git/fmt-merge-msg.h, branch mk/diff-delta-avoid-large-offset github.com: git/git.git fmt-merge-msg: use branch.$name.description 2011-10-07T17:11:47+00:00 Junio C Hamano gitster@pobox.com 2011-10-07T06:12:09+00:00 898eacd8ada2d012f977948350ed60845e238037 This teaches "merge --log" and fmt-merge-msg to use branch description information when merging a local topic branch into the mainline. The description goes between the branch name label and the list of commit titles. The refactoring to share the common configuration parsing between merge and fmt-merge-msg needs to be made into a separate patch. Signed-off-by: Junio C Hamano <gitster@pobox.com> 
This teaches "merge --log" and fmt-merge-msg to use branch description
information when merging a local topic branch into the mainline. The
description goes between the branch name label and the list of commit
titles.

The refactoring to share the common configuration parsing between
merge and fmt-merge-msg needs to be made into a separate patch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>