如何作为单独的分支+合并提交中断git提交的子序列

Question

什么非交互式git命令实现从Before到After(其中BC是合并提交)的更改

之前:

A---B---C---D

后:

  B---C
 /     \
A-------BC---D'

Answer 1

这是我要做的:

$ git branch to-merge-in C-commit-ID    # Create a branch at C
$ git reset --hard A-commit-ID          # Reset current branch to A
$ git merge --no-ff to-merge-in         # Merge in branch. Create a merge commit.
$ git cherry-pick D-commit-ID           # Grab the commit D