On Fri, Mar 02, 2012 at 04:58:11PM +0000, Arnd Bergmann wrote: > On Friday 02 March 2012, Jason wrote: > > > > > > I have other commit IDs for the two patches that I took from your > > > emails, so you should rebase the other patches on top of the > > > version that I have in the arm-soc/kirkwood/board branch, otherwise > > > we end up with duplicate commits my tree when I pull them again. > > > > Got it, I cherry-picked the series over and incorporated Grant's > > suggestions. > > > > Just making sure you know about this one: > > git rebase -i --onto arm-soc/kirkwood/board torvalds/master > > The '-i' lets you pick which ones you want to move over, then it > applies all patches from the current branch that are not on > torvalds/master on top of the last commit from arm-soc/kirkwood/board. > > If you don't know it yet, I suggest you play with this for an hour > or so that will be very well invested time. If you knew this, then nevermind.
I use the daylights out of git rebase -i, but hadn't made use of --onto yet. Thanks for the tip. thx, Jason. _______________________________________________ devicetree-discuss mailing list devicetree-discuss@lists.ozlabs.org https://lists.ozlabs.org/listinfo/devicetree-discuss