how to break off a sub-sequence of git commits as a separate branch + merge commit
What non-interactive git command(s) achieve the change from Before to After (where BC is a merge commit)
B---C / \ A-------BC---D'
One Solution collect form web for “how to break off a sub-sequence of git commits as a separate branch + merge commit”
Here’s what I’d do:
$ 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