cherry-pick/revert: remember --rerere-autoupdate