On Tue, May 17, 2016 at 01:55:56PM -0400, Gabriel L. Somlo wrote:
> On Tue, May 17, 2016 at 07:45:28PM +0200, Laszlo Ersek wrote:
> > On 05/17/16 18:44, Jordan Justen wrote:
> > > Series Reviewed-by: Jordan Justen <[email protected]>
> >
> > Thank you very much. I'll await a (hopefully quick ;)) T-b from Gabriel.
>
> Tested-by: Gabriel Somlo <[email protected]>
>
> Took me a bit longer than it should have, partially b/c of screwing
> around with the lf-only diff patches I get through email and the cr-lf
> files edk2 is using. After some pain, I settled on
>
> "git am --keep-cr foo.patch"
>
> which works on re-applying the mixed (lf commitblurb, cr-lf payload)
> patches which are more or less typical for edk2, but is there an easy
> straightforward flag one can use on lf-only patches to tell "git am"
> to work with the lf vs cr-lf discrepancy in the patches one gets via
> email ?
Nevermind, that's
git am --ignore-space-change foo.patch
Guess I better write that down into my secret bag of cut'n'paste
tricks, since I'll most likely forget all about it by the next time I
need it :)
Cheers,
--G
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
