On 09/19/13 16:46, Ryan Harkin wrote:
>
>
>
> On 19 September 2013 12:30, Laszlo Ersek <ler...@redhat.com
> <mailto:ler...@redhat.com>> wrote:
> Sigh. These hunks don't apply, and it's my fault. The file has LF line
> endings, not CRLF ones.
>
>
> I know it isn't a solution, but a workaround to these problems, however
> I see it so much, I have a git alias defined that ignores this problem.
>
> In ~/.gitconfig I have:
>
> [alias]
> amm = am --ignore-whitespace --ignore-space-change
>
> Then, instead of applying a patch using "git am", I use "git amm".
>
> Of course, you could use "git am --ignore-whitespace
> --ignore-space-change" each time and not define an alias, but that's too
> much typing for me.
Thanks for the idea, I didn't know about these options!
I like to configure my git-svn clone to be aware of CRLF:
[core]
whitespace = cr-at-eol
[am]
keepcr = true
These options keep git from complaining about and/or stripping CRLFs in
patches. It would be great if I could convince git to enforce them, even.
Thanks
Laszlo
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
