Cherry-pick and revert

`git cherry-pick` applies one commit's change here. Like a rebase it is a three-way merge against that commit's parent, and it produces a new commit rather than moving the old one.

`git revert` is the same machinery inverted: it merges the commit's parent onto the commit, producing a change that undoes it, and records that as a new commit.

Revert adds history rather than removing it, which is why it is the right answer on a branch other people already have. Reset and rebase are for history nobody else has seen.