From: Carlos Martín Nieto Date: Thu, 02 Jun 2011 10:32:59 GMT Subject: Re: Can't get git rebase --onto to work Message-ID: <20110602103259.GA30081@centaur.lab.cmartin.tk> In-Reply-To: On Thu, Jun 02, 2011 at 11:17:41AM +0100, Howard Miller wrote: > Trying to explain this as concisely as possible. > > I started with the following branches (names changed to protect the guilty)... > > * clientA > * clientB > > both have a common ancestry.... > > I then checked out clientB created a new branch clientB_patch and did > a load of work and commits. > > However, I actually wanted all those commits to apply to clientA > branch instead so.... > > git checkout clientA > git checkout -b clientA_patch (to ensure I didn't wreck original branch) > git rebase --onto clientA_patch clientB clientB_patch The man page for git-rebase covers this exact situation (around line 88 in my version) . In its case, it's git rebase --onto master next topic which translates to your case as git rebase --onto clientA clientB clientB_patch Cheers, cmn -- Carlos Martín Nieto | http://cmartin.tk "¿Cómo voy a decir bobadas si soy mudo?" -- CACHAI