On Wed, 29 Mar 2006, Linus Torvalds wrote:
Right now, the sequence is:
git checkout mine # if required
git rebase --onto his origin
vs
git checkout his
git cherry-pick origin..mine
Btw, I realize that the advantage of "git rebase" is that it doesn't
change somebody elses branch. However, we'd still be a lot better off with
us simply doing the equivalent of something like
git checkout -b new-mine his &&
git cherry-pick origin..mine &&
git rename-branch -f new-mine mine
instead of what git-rebase does now.
Linus