git-diff: do not turn off -p/-M with any diff options.