我没有从分支机构分支，而是从分支机构分支

Question

I have 3 branches, Master, B1, and B2.

Is it possible to rebase B2 back off of master, isntead of B1.

I did a checkout on Master and was working in B1 to resolve things. I did a second checkout, and thought it was off of Master, and resolved more bugs.

Now I am in a scenario of Code Reviews and i see something like this. Master -> B1 -> B2

and Both B1 and B2 are up for code review, so B2 contains B1s commits.

Is it possible to rebase B2 so it is off of Master such that it doesnt see B1's commit history?

I was not sure how to reset where it forked from or the best course of action to resolve it.

Answer 1

Yes, you can do this with rebase:

git checkout B2
git rebase --onto master B1

This will rebase the commits from B2 up to, but not including, the commit at the tip of B1 onto master .