Re: kernel cherry UN-picking?

Junio C Hamano [off-list ref] writes:

Suppose you have something like this (you may have more than one
such merge but the principle is the same):

  U---o---o---o---M---x---o---o---o---T
                 /
   Linville o---o

Up to 'U' you have already sent upstream and no need for
resending.  'M' is merge with Linville tree.  'x' is the bad
one, and 'o' are good ones.  'T' is the tip of your net driver
branch.

First find out 'x'.  Then

        git format-patch -o ./outdir x..T

would format everything starting from (but excluding) 'x' up to
'T'.

Then

        git reset --hard x^
        git am ./outdir/*.patch

would rebuild:

  U---o---o---o---M---x---o'--o'--o'--T'
                 /
   Linville o---o

Correction.  This would rebuild:

    U---o---o---o---M-------o'--o'--o'--T'
                   /
     Linville o---o

as if 'x' did not happen.