Fix some "git rebase" problems