back [alt+←]
30

How git cherry-pick and revert use 3-way... in programming by Julia Evans