Change branch parent

Question

Have following branches structure:

                       master                      /       \                 BranchA      BranchB 

But it should be:

                 master                   /                        BranchA                        /          BranchB 

Could anyone advice how to re-hang BranchB as child of BranchA?

Answer 1

You want to use rebase. With BranchB checked-out, do

git rebase BranchA 

Answer 2

git checkout branchB; git rebase branchA; 

will do this for you. bear in mind if this has been pushed somewhere else, you'll screw up the history.