Fix diff-options references in git-diff and git-format-patch