Rebase for git stupidity