diff: allow --patch & cie to override -s/--no-patch