cherry-pick/revert: reject --rerere-autoupdate when continuing