From: Junio C Hamano <junkio@cox.net>
Date: Fri, 11 May 2007 21:56:20 GMT
Subject: Re: kernel cherry UN-picking?
Message-ID: <7vhcqj9g8r.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <4644E0A2.90008@garzik.org>

Jeff Garzik <jeff@garzik.org> writes:

> 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"  ;-)
>
> 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.

Do the commits on the branch being rebuilt form a single strand
of pearls without any merges?  If that is the case, what I would
do is:

	git heckout thatbranch
	git format-patch -o ./+outdir linus
        rm ./+outdir/0XXX-that-unwanted-patch.patch
        git reset --hard linus
        git am ./+outdir/????-*.patch