I can also recommend git flight rules: https://github.com/k88hudson/git-flight-rules

It saved my work a couple of times.