git-race

https://github.com/wohyah/git-race

This is a script that checks branches that have happened since you branched, and tells you if any of them are in conflict with yours.