Rebase with fewer options