Re: git is live
Pedro Alves <[email protected]>
| Newsgroups | gmane.comp.gdb.devel,gmane.comp.gnu.binutils |
|---|---|
| Message-ID | <[email protected]> |
On 10/28/2013 10:35 PM, 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.) Yeah, as others have said, use "git rebase --onto new-branch". I actually use stgit myself, so I do "stg rebase $BRANCH", which rebases the patch series (applied or not) on top of any branch (IOW, it already does the equivalent of --onto) so this question doesn't even arise for me. -- Pedro Alves