I\'ve got the following situation on my git log:
git log
commit 111 <-- need to push it to the repository commit 222 <-- need to stash this one ..
I solving doing this:
Remove the target commit
git revert --strategy resolve 222
Save commit 222 to patch file
git diff HEAD~2 HEAD~1 > 222.patch
Apply this patch to unstage
patch -p1 < 222.patch
Push to stash
git stash
Remove temp file
rm -f 222.patch
Very simple strategy in my opinion