diff: allow --no-patch as synonym for -s