On 5 Feb 2009, at 12:59, Santi Béjar wrote:

quoted text
> 2009/2/5 Robert Haines <rhaines@manchester.ac.uk>:
>> Hi all,
>>
>> I would like to use git-fmt-merge-msg to produce automatic  
>> summaries of what
>> commits are being merged when I merge one branch into the other -  
>> like I see
>> all the time in git.git, etc. The problem I am having is that I can  
>> only
>> seem to get it to work with remote branches via .git/FETCH_HEAD -  
>> basically
>> I don't know what else I can feed it to do what I want.
>>
>> Say I have a local repo with no remotes so no .git/FETCH_HEAD. Can  
>> I use
>> git-fmt-merge-msg to produce such a summary when I'm just merging  
>> local
>> branches? I've tried feeding just about everything I can find  
>> in .git/ into
>> it but with no luck. Is there anything generated during the merge  
>> that can
>> be used as input if I do a merge --no-commit? A list of merged  
>> commits or
>> something?
>>
>> I'm sure I've missed something simple here...
>
> Sure :-)
>
> 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!

Thanks for the pointer and sorry for the noise...

Cheers,
Rob

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html