Dear xiangfu, In message <[email protected]> you wrote: > > there is two branch in my git[2]. > [xiangfu] this one , I try to merge with the upstream. > [u-boot] is the upstream. > > I use "git diff u-boot..xiangfu > ~/pi_project.patch" to generate the > patch[1].
No. Please use git-format-patch to create patches. Make sure to split your changes lgically into commits - the commits should be small and orthogonal to each other. Please see http://www.denx.de/wiki/U-Boot/Patches for details. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [email protected] Pray: To ask that the laws of the universe be annulled in behalf of a single petitioner confessedly unworthy. - Ambrose Bierce _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
