
1 Mar
2010
1 Mar
'10
7:10 p.m.
Terry,
On 2/28/2010 8:48 PM, Lv Terry-R65388 wrote:
Hi Denk,
It seems that "git am" doesn't work for me.
The steps are:
- Save the patch as txt file in outlook and copy to u-boot directory.
- Use git am to apply the patch.
r65388@szx32-17[/home/r65388/uboot-imx]686% git am -i -u --whitespace=strip ./"U-Boot PATCH V4 1111 Add initial support for Freescale mx51evkboard.txt"
I sometimes have problems with Thunderbird whitespace-damaging patches in Windows, and find that stripping the '\r' carriage-return characters seems to work. My weapon of choice is 'dos2unix', but you could go old-school with 'tr' or even change the file type in vim.
HTH, Ben