Git：insert提交保留无ff历史

Question

I have git history like this.

Then I want to insert 2 commits after commit A (which are ingored at commit B). Like this.

I tried rebase but it swallows no-fast-forward branch. How can I achieve this?

Answer 1

A git rebase should work, but you might need to add the --preserve-merges option:

-p
--preserve-merges

Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved.