I've modified the scrip that generates the commit messages, so that
it will not generate emails for merged commits.
Now you should see only new commits messages and merge notices.
For nice merge notices (including a changelog style summary of the
merged commits), everybody should make sure that they have:
[merge]
log = true
in your ~/.gitconfig.
A quick way to check for it is:
git config --get merge.log
and to set it:
git config --global merge.log true
You could also add always --log to git-merge and git-pull, but there's
a high chance that you will forget it at some point.
Andrei