Git squash without repetitive conflictshttps://github.com/twolfson/git-sqwish by twolfson • 13 years ago 2 0 13 years agoGIgithub.com