Someone needs to write a good single-purpose tool for safely doing git squashes. Maybe Tower will add it someday. 😉