2018-02-07 UTC
# 
[prtksxna] asuh You should be able to go to a new branch `git checkout -b exp` set it back to the original commit from upstream `git reset --hard sha1here` and then cherry-pick your commit piece-by-piece using `-p` like `git cherry-pick theothersha1 -p`. I think that should work. Or else unstage the commit and then `git add -p`.