git rebase one commit

git checkout master
git cherry-pick <commit ID of XX>
git checkout Feature-branch
git reset --hard HEAD^