Autogenerated HTML docs for v2.31.1-606-gdf6c4f

1 files changed, 11 insertions, 2 deletions

diff --git a/git-format-patch.html b/git-format-patch.html
index a61d3cdb5..6c977abff 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -779,7 +779,7 @@ git-format-patch(1) Manual Page
 <div class="sect1">

 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>Prepare each commit with its "patch" in

+<div class="paragraph"><p>Prepare each non-merge commit with its "patch" in

 one "message" per commit, formatted to resemble a UNIX mailbox.

 The output of this command is convenient for e-mail submission or

 for use with <em>git am</em>.</p></div>

@@ -2538,6 +2538,15 @@ Extract three topmost commits from the current branch and format them
 </div>

 </div>

 <div class="sect1">

+<h2 id="_caveats">CAVEATS</h2>

+<div class="sectionbody">

+<div class="paragraph"><p>Note that <code>format-patch</code> will omit merge commits from the output, even

+if they are part of the requested range. A simple "patch" does not

+include enough information for the receiving end to reproduce the same

+merge commit.</p></div>

+</div>

+</div>

+<div class="sect1">

 <h2 id="_see_also">SEE ALSO</h2>

 <div class="sectionbody">

 <div class="paragraph"><p><a href="git-am.html">git-am(1)</a>, <a href="git-send-email.html">git-send-email(1)</a></p></div>

@@ -2554,7 +2563,7 @@ Extract three topmost commits from the current branch and format them
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-04-03 07:10:10 JST

+ 2021-05-12 14:17:56 JST

 </div>

 </div>

 </body>