Merge branch 'so/format-patch-doc-on-default-diff-format'

Docfix. * so/format-patch-doc-on-default-diff-format: doc/diff-options: fix out of place mentions of '--patch/-p'

Junio C Hamano committed Nov 11, 2020 at 13:18 UTC c5a802f0ce46c34232cd85ae51d6f5d1cd5a574b

No changes.