Merge branch 'jk/doc-format-patch-skips-merges'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 May 2021 06:27:22 +0000 (15:27 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 May 2021 06:27:23 +0000 (15:27 +0900)
commit270f8bfe0038fe84f8a08bdc26f8b4094df10b08
treea11c406c829380c050c4ed1c35eb8ce26d88fd0c
parent0b77301bf4c8e3b37beee0b5c8dcf26beaa6e789
parent8e0601f568ebf512f2edc606bdbf1a508b3c28a6
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
Documentation/git-format-patch.txt