Merge branch 'so/format-patch-doc-on-default-diff-format'
authorJunio C Hamano <redacted>
Wed, 11 Nov 2020 21:18:37 +0000 (13:18 -0800)
committerJunio C Hamano <redacted>
Wed, 11 Nov 2020 21:18:37 +0000 (13:18 -0800)
Docfix.

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

1  2 
Documentation/diff-options.txt

Simple merge
git clone https://git.99rst.org/PROJECT