git：如何将一些提交移动到新分支

Question

我一直在直线工作：

A---B---C---D---E---F (master:HEAD)

现在我想向后移动：

git checkout C

并将最后几个提交移至新分支：

选项 1：

          D---E---F (new:HEAD)
         /
A---B---C (master)

选项 2：

          F (new:HEAD)
         /
A---B---C (master)

如何变基为选项 1 以及如何变基为选项 2？

Answer 1

从您的第一个图表（master = HEAD = F）到选项 1：

git branch new        # Make a 'new' branch pointing at HEAD, which is F
git reset --hard C    # Move master back to point at C
git checkout new      # Make HEAD follow new, and get F in the working tree

从选项 1 到选项 2（从上面离开的地方继续），

git rebase -i master  # Start the process of re-jiggering this branch
# edit the commit list that opens up to only include F
# save and exit
# resolve potential conflicts from missing changes in D and E

直接从您的起点转到选项 2：

git checkout -b new C  # Start the 'new' branch at C
git cherry-pick F      # Include F on it
git checkout master    # Switch back to master
git reset --hard C     # Rewind master to the earlier commit