On 1/13/15, 12:33 AM, "William Pretty Security" <[email protected]> wrote:
>Thanks for all the help guys. >I don't mind if I have to start over from scratch. >Just so long as I end up with a Kernel with RAID support. > >I am cross-compiling on a quad core i7 laptop, so no worries about >how long it takes. Just so long as I end up with a working image I can >copy to >a uSD card. Yeah, but I think what Robert was showing you is that GIT is your friend and is extremely powerful. I highly recommend that you take the time to learn GIT because it will save you so much time. It also helps organize your development process. Regards, John > >Thanks again ... > >-----Original Message----- >From: [email protected] [mailto:[email protected]] >On Behalf Of John Syn >Sent: Tuesday, January 13, 2015 1:14 AM >To: [email protected] >Subject: Re: [beagleboard] Cross Compile Problem > > >On 1/12/15, 1:38 PM, "Robert Nelson" <[email protected]> wrote: > >>On Mon, Jan 12, 2015 at 3:35 PM, William Pretty Security >><[email protected]> wrote: >>> Pardon my ignorance Robert, but I'm not sure what you mean by "rebase >>>the branch" ? >> >>git commit -a -m 'xyz' -s >>git pull --rebase >I think this is a little more complicated. I¹m guessing William is on the >tmp branch, but since the he probably hasn¹t setup the tmp branch to >track the origin/<xyz> branch, he will get an error. If he did setup the >tmp branch to track origin/<xyz> branch, then he would retain all his >kernel changes after updating his repo. >> >>or just: >> >>git checkout master -f >>git branch -D tmp >>git pull >>git checkout origin/<xyz> -b tmp >In this case William will loose all his kernel changes. > >At least I think this is how it works. > >Regards, >John >> >>Regards, >> >>-- >>Robert Nelson >>http://www.rcn-ee.com/ >> >>-- >>For more options, visit http://beagleboard.org/discuss >>--- >>You received this message because you are subscribed to the Google >>Groups "BeagleBoard" group. >>To unsubscribe from this group and stop receiving emails from it, send >>an email to [email protected]. >>For more options, visit https://groups.google.com/d/optout. > > >-- >For more options, visit http://beagleboard.org/discuss >--- >You received this message because you are subscribed to the Google Groups >"BeagleBoard" group. >To unsubscribe from this group and stop receiving emails from it, send an >email to [email protected]. >For more options, visit https://groups.google.com/d/optout. > > >----- >No virus found in this message. >Checked by AVG - www.avg.com >Version: 2015.0.5645 / Virus Database: 4260/8917 - Release Date: 01/12/15 > > >----- >No virus found in this message. >Checked by AVG - www.avg.com >Version: 2015.0.5577 / Virus Database: 4257/8870 - Release Date: 01/04/15 >Internal Virus Database is out of date. > >-- >For more options, visit http://beagleboard.org/discuss >--- >You received this message because you are subscribed to the Google Groups >"BeagleBoard" group. >To unsubscribe from this group and stop receiving emails from it, send an >email to [email protected]. >For more options, visit https://groups.google.com/d/optout. -- For more options, visit http://beagleboard.org/discuss --- You received this message because you are subscribed to the Google Groups "BeagleBoard" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
