From: Linus Torvalds <torvalds@osdl.org>
Date: Wed, 29 Mar 2006 19:39:06 GMT
Subject: Re: How to switch kernel customizations from 2.6.15.6 to 2.6.16?
Message-ID: <Pine.LNX.4.64.0603291136100.15714@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.64.0603291102440.15714@g5.osdl.org>



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