Jeff Garzik <jeff@xxxxxxxxxx> 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
-
To unsubscribe from this list: 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
