Linus Torvalds wrote: > In contrast, here's an alternate workflow that is much easier to explain, > and doesn't involve "rebase" at all: > > git checkout his > git cherry-pick origin..mine [...] > Now, "git cherry-pick" doesn't actually support the above format, and I'm > not saying that the "git rebase" name itself is evil. I think we could fix > "git rebase" to work better, but the semantics - the way they are > _designed_ right now - are just horrible. Perhaps if possible also have git cherry-pick --whole-branch branchname meaning git cherry-pick branchname:begining..branchname:HEAD -- Jakub Narebski - : 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