From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 11 May 2007 21:55:09 GMT
Subject: Re: kernel cherry UN-picking?
Message-ID: <20070511145509.09f3c354.akpm@linux-foundation.org>
In-Reply-To: <4644E0A2.90008@garzik.org>

On Fri, 11 May 2007 17:31:14 -0400
Jeff Garzik <jeff@garzik.org> wrote:

> So, I merge the next batch of net driver patches.  After I merge a PPP 
> patch, deep in the pile-o-patches, Andrew says "I shouldn't have sent 
> that to you, don't apply it"  ;-)

I'm bad.

> Right now, my process for reversing this damage is to start over: 
> create a new branch, manually double-click the mouse on each commit in 
> the "damaged" branch, and git-cherrypick it.  Very, very time consuming 
> when you have more than a couple commits.
> 
> Is there a better way?
> Is there any way to say "cherrypick all commits except <these>"?

Let me refactor your question more usefully.  What we want is quilt-export
and quilt-import.  And I really mean that: commands called git-quilt-export
and git-quilt-import.

coz then, your problem becomes

	git-quilt-export
	<delete one line from the series file>
	git-quilt-import


Because git-quilt-export and git-quilt-import would be useful for lots of
other things.