Rebase with knife-cloud