make *options work with "or"+commit