squashing commits when you don't know how to rebase