git - 更改分支父级

Question

具有以下分支结构：

                       master
                     /       \
                BranchA      BranchB

但它应该是：

                 master
                  /           
            BranchA        
               /
         BranchB

谁能建议如何将 BranchB 重新挂为 BranchA 的孩子？

Answer 1

你想使用rebase。签出 BranchB 后，执行

git rebase BranchA

Answer 2

git checkout branchB; git rebase branchA;

会为你做这件事。请记住，如果这已被推到其他地方，您将搞砸历史。

Answer 3

I suggest using git rebase -i(interactive mode) to edit the whole history, which commit you want as the starting point of new branch rebase, the commit message, etc.

In your case, if you desired situation is:

             master
              /           
        BranchA        
           /
     BranchB

but on branchA you already have some commits:

             master
              /           
        BranchA
           |
        commit A1
           |
        commit A2

You may want to choose the A1 as starting point of branchB, not A2(the latest, where the HEAD of A is), then git rebase -i can help.