From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Nov 2020 21:18:37 +0000 (-0800)
Subject: Merge branch 'so/format-patch-doc-on-default-diff-format'
X-Git-Tag: v2.30.0-rc0~102
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=c5a802f0ce46c34232cd85ae51d6f5d1cd5a574b

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'
---

c5a802f0ce46c34232cd85ae51d6f5d1cd5a574b