This is the mail archive of the gdb@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: git is live


On 10/29/2013 06:35 AM, Cary Coutant wrote:
I got this far with no problems (thanks!), but my old branches don't
seem to have any common commits with the new binutils-gdb/master. Are
you doing the rebase with an explicit merge-base (e.g., "git branch
new-branch binutils-gdb/master;  git rebase --onto new-branch
old-master old-branch")? Or should "git rebase binutils-gdb/master
old-branch" work? (I'm hesitant to try that.)

'git rebase --onto new-branch BRANCH_POINT old-branch' works for me. BRANCH_POINT is the commit id of master that your old-branch is created against.

I switched my origin to the new repo, and do 'git rebase --onto master BRANCH_POINT old-branch' for my every local branch, but have to check BRANCH_POINT manually for every local branch.

--
Yao (éå)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]