Dirk Behme wrote: > Scott Wood wrote: >> It can be applied with "git am" (well, not the diffstat, but the special >> rename diff hunk that git also generates). > > Ok, thanks. But not with other tools, like plain 'patch', correct?
Right, until someone fixes that. :-) Which I suppose could be a problem if "git am" refuses to accept the patch and the normal patch command needs to be used to resolve the conflict (I really wish git would treat it more like a merge from a UI perspective, even if it doesn't look that way internally). -Scott _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
