Advanced cherry picking

[Erik de Castro Lopo]

Hi all,

My somewhat frenzied hacking practices has resulted in a mainline
branch and a hacked branch which contains some patches that I
want back in the mainline and others that are not yet ready. 
Furthermore, these patches are very much interleaved.

Is there some way I can get the patches I want (and only those)
from the hacked branch back into mainline, in such a way that
I can still merge from the mainline to the hacked branch?

Any clues on an easy and reliable way to do this?

Erik
-- 
-----------------------------------------------------------------
Erik de Castro Lopo
-----------------------------------------------------------------
"I think there is a world market for maybe five computers."
 -- Thomas Watson, Chairman of IBM, 1943