Reorder commits one of which is a merge

Question

I would like to reorder two commits, one of which is a merge. So I would like to go from:

A
|\
B \
|  \
C   D

to

B
|
A
|\
C D

Is it possible and safe? Commits C and D have already been pushed, but A and B have not. git rebase -i seems to make each commit having one parent only...

Answer 1

This should work:

git reset --hard C
git merge D
git cherry-pick B