make *options work with "or"+commit

1e86b47