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). Linus - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html