git rebase commit 1 into 2 code example
Example: git rebase one commit
git checkout master
git cherry-pick <commit ID of XX>
git checkout Feature-branch
git reset --hard HEAD^
git checkout master
git cherry-pick <commit ID of XX>
git checkout Feature-branch
git reset --hard HEAD^