git rebase -i origin/HEAD --autostash
find the needed commit and change pick to e (short for edit)
save and exit
Then git reset HEAD~
If you run git status you can see the changes are unstaged
Then gotopkg sckit-image and git add and git commit as normal, then do the same for the second split
Tthen git rebase --continue and git push --force-with-lease