Interactive rebasing