Thread (5 messages) flat view 5 messages, 3 authors, 2016-06-15

Re: How to switch kernel customizations from 2.6.15.6 to 2.6.16?

From: Linus Torvalds <torvalds@osdl.org>
Date: 2016-06-15 22:42:22


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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help