From: Junio C Hamano <junkio@cox.net>
Date: Sat, 4 Feb 2006 03:20:16 +0000 (-0800)
Subject: fmt-merge-msg: show summary of what is merged.
X-Git-Tag: v1.2.0~44
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1cb303872ab1ba73fcc52167c61fc4211c843cf5?hp=1cb303872ab1ba73fcc52167c61fc4211c843cf5

fmt-merge-msg: show summary of what is merged.

In addition to the branch names, populate the log message with
one-line description from actual commits that are being merged.

This was prompted by Len's 12-way octopus.  You need to have
'merge.summary' in the configuration file to enable it:

$ git repo-config merge.summary yes

Signed-off-by: Junio C Hamano <junkio@cox.net>
---