git cherry-pick
git cherry-pick <commit>
Risk: Safe
What it does
Copies one commit from somewhere else onto your branch.
When to use it
When you need one fix, not a whole branch.
Example
$ git cherry-pick a1b2c3dCopy that one commit here.
$ git cherry-pick --abortStop and go back to before.
Learn it in: Merge or rebase? Plus cherry-pick · Official docs