[orefalo]

Can't agree more, I'll push it even further...

Use G2! which does pull --rebase magically on your behalf.

http://orefalo.github.io/g2/

https://github.com/orefalo/g2