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.
