Re: [GIT]: Networking

Junio C Hamano
2009-01-06T07:01:21Z

David Miller <davem@davemloft.net> 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.