From: Linus Torvalds Date: Tue, 30 May 2006 00:42:42 GMT Subject: Re: [PATCH 0/10] re-based and expanded tree-walker cleanup patches Message-ID: In-Reply-To: <7virno79a7.fsf@assigned-by-dhcp.cox.net> On Mon, 29 May 2006, Junio C Hamano wrote: > > Sorry for having you have done this -- last night I've merged > the series without rebasing and have the result in "next". I'll > compare to see if you have spotted my mismerges there tonight. It was interesting. I cleaned up the series and switched the order of some commits in my tree by doing first a "git rebase" and then cherry-picking them into another branch, and using "git commit --amend" to fix up some of the things I had missed. Pretty powerful, although at one point I was wondering about having a "git rebase" that could switch commits around or drop unwanted ones (ie let the user edit the cherry-picking list before the actual rebase).