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... Alternatively, am I just  
barking up the wrong tree?

Thanks,
Rob

-- 
Robert Haines

Research Associate, RealityGrid          Tel. : +44 (0)161 275 6067
Research Computing Services              Fax. : +44 (0)161 275 0637
University of Manchester                 Email: rhaines@manchester.ac.uk
Oxford Road                              Web  : www.realitygrid.org
Manchester, M13 9PL                           : www.rcs.manchester.ac.uk

--

[ message continues ]

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.

HTH,
Santi
--

[ message continues ]

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

--

[ message continues ]

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

HTH,
Santi
--

[ message continues ]