rebase -i -p: leave a --cc patch when a merge could not be redone