remove useless diff option
reverse autostrip behavior to be default