Is there a way to rebase a single commit from a branch onto another branch?
I have this branch structure:
-- -- -- -- -- (Master) \\
You can cherry-pick XX to master.
git checkout master git cherry-pick
And remove the last commit from the feature branch with git reset.
git checkout Feature-branch git reset --hard HEAD^