From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 May 2021 06:27:22 +0000 (+0900)
Subject: Merge branch 'jk/doc-format-patch-skips-merges'
X-Git-Tag: v2.32.0-rc0~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=270f8bfe0038fe84f8a08bdc26f8b4094df10b08;p=thirdparty%2Fgit.git

Merge branch 'jk/doc-format-patch-skips-merges'

Document that "format-patch" skips merges.

* jk/doc-format-patch-skips-merges:
  docs/format-patch: mention handling of merges
---

270f8bfe0038fe84f8a08bdc26f8b4094df10b08