How to make git send an email in case of unresolved merge

I use git to share config files between several computers. So I've set up a small script that does a bunch of git pull / git push 开发者_如何学JAVAeach time one of these computers is started or halted.

The problem is that I don't always take the time to read the output of these scripts, and so I could miss some merging conflicts warnings.

Is there a way to make git send me an email each time a git pull from a repository leads to unresolved conflicts ?

---

Modify the example hook (in .git/hooks/prepare-commit-msg.sample (the first one, that uncomments "Conflict" messages)) to find conflict messages and send them in email.

http://git-scm.com/docs/githooks