Rebasing in magit is so choice. I especially love magit-rebase-subset.