cherry-pick: make -r the default