Throwing things at the wall to see what sticks. git rebase -i is my friend.