混帐：如何某些提交移动到新的分支

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

要从第一图（主= 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