From: Santi Béjar <santi@agolina.net>
Date: Thu, 05 Feb 2009 13:35:57 GMT
Subject: Re: How to use git-fmt-merge-msg?
Message-ID: <adf1fd3d0902050535y631035b6lfc09e0982aefdfd7@mail.gmail.com>
In-Reply-To: <B22C0229-47F4-48EC-9C68-63696C7BB3F2@manchester.ac.uk>

2009/2/5 Robert Haines <rhaines@manchester.ac.uk>:
>
> On 5 Feb 2009, at 12:59, Santi Béjar wrote:
>

[...]

>>
>> Manpage of git merge:
>>      --log
>>          In addition to branch names, populate the log message with
>> one-line
>>          descriptions from the actual commits that are being merged.
>>
>> Manpage of git config:
>>      merge.log
>>          Whether to include summaries of merged commits in newly created
>>          merge commit messages. False by default.
>
> Aaaahhhh.... Time for me to upgrade. The version of git I am using (1.5.3.8)
> doesn't have merge --log. No wonder I couldn't find it!

In that version you can use --summary and merge.summary, but they are
now deprecated.

HTH,
Santi