Interactive Rebase With History Preserving Past Merges about git-imerge

[mhagger]

I don't know a lot of the details of --preserve=merges so it's hard for me to say how difficult it would be. ISTM that it depends a lot on the branch point of the merged-in branches.

If a merged-in branch sprouted from the target branch before the branch being rebased, then it seems like it would be a relatively simple matter of rebasing the -m1 diff of the merge commit, then adding the original second parent to the rebased merge commit. I don't think that this would require dramatic changes to git-imerge.

But if the merged-in branch has other ancestors on the to-be-rebased branch, then it gets more complicated.

I don't expect to have time to work on this myself in the foreseeable future.