[Development] Rebasing

Thiago Macieira thiago.macieira at intel.com
Fri Jan 26 17:31:59 CET 2018


On sexta-feira, 26 de janeiro de 2018 07:17:24 PST Konstantin Tokarev wrote:
> 26.01.2018, 18:14, "Igor Mironchik" <igor.mironchik at gmail.com>:
> > Hi,
> > 
> > What if you have a patch based on 5.11 branch and you want to rebase it
> > to 5.9, how do you do such work? Do you use regular git rebase? Or maybe
> > you just do a new branch based on 5.9, do changes, commit and changes
> > Change-Id to the existing and do push?
> 
> Checkout 5.9, cherry-pick your old patch

Which is effectively equal to:

git rebase --onto origin/5.9 origin/5.11 my-patch-branch

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center






More information about the Development mailing list