I just went through a lengthy merge conflict and noticed that I have a bunch of commits from my working tree that should have been squashed before I did the merge. I have not pushed the merge yet but I would like to avoid having to re-do the merge after checking out a new branch and doing the squash.

Is there a way that I can do something similar to cherry-picking the merge commit but changing the relevant parent of the merge?