Re: [GIT]: Networking

From: Junio C Hamano
Date: Tue Jan 06 2009 - 02:01:23 EST


David Miller <davem@xxxxxxxxxxxxx> writes:

> That wouldn't have helped me in this case at all.
>
> I had 4 firmware patches to apply, each one had to add entries
> to the same file.
>
> The first patch had to be skipped.
>
> So the second one, which is the first one I added (which is the acenic
> bogon with the missed delete), is the one GIT wouldn't take but patch
> would.

What I typically do when I see myself in such a situation is to apply all
of four patches to a throw-away branch once, and then discard that branch
right away. Then I can apply only the good three patches, skipping the
first one, and "am -3" would still apply.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/