Autogenerated HTML docs for v1.4.2-rc2

diff --git a/git-format-patch.html b/git-format-patch.html
index 9129d8111dde0dc4c7c4ee54d4a3132e38a74b5e..5595286ba5420f3e7ba4d34c9af27b9b16419c1e 100644 (file)
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -273,8 +273,9 @@ git-format-patch(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-format-patch</em> [-n | -k] [-o &lt;dir&gt; | --stdout] [--attach]\r
+<div class="content"><em>git-format-patch</em> [-n | -k] [-o &lt;dir&gt; | --stdout] [--attach] [--thread]\r
                    [-s | --signoff] [--diff-options] [--start-number &lt;n&gt;]\r
+                   [--in-reply-to=Message-Id]\r
                    &lt;since&gt;[..&lt;until&gt;]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
@@ -293,6 +294,10 @@ output, unless the --stdout option is specified.</p>
 they are created in the current working directory.</p>\r
 <p>If -n is specified, instead of "[PATCH] Subject", the first line\r
 is formatted as "[PATCH n/m] Subject".</p>\r
+<p>If given --thread, git-format-patch will generate In-Reply-To and\r
+References headers to make the second and subsequent patch mails appear\r
+as replies to the first mail; this also generates a Message-Id header to\r
+reference.</p>\r
 </div>\r
 <h2>OPTIONS</h2>\r
 <div class="sectionbody">\r
@@ -357,6 +362,26 @@ is formatted as "[PATCH n/m] Subject".</p>
         Create attachments instead of inlining patches.\r
 </p>\r
 </dd>\r
+<dt>\r
+--thread\r
+</dt>\r
+<dd>\r
+<p>\r
+        Add In-Reply-To and References headers to make the second and\r
+        subsequent mails appear as replies to the first.  Also generates\r
+        the Message-Id header to reference.\r
+</p>\r
+</dd>\r
+<dt>\r
+--in-reply-to=Message-Id\r
+</dt>\r
+<dd>\r
+<p>\r
+        Make the first mail (or all the mails with --no-thread) appear as a\r
+        reply to the given Message-Id, which avoids breaking threads to\r
+        provide a new patch series.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>CONFIGURATION</h2>\r
@@ -425,7 +450,7 @@ git-format-patch -M -B origin
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:37:46 UTC\r
+Last updated 25-Jul-2006 22:23:03 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-format-patch.txt b/git-format-patch.txt
index 4ca0014dac64729bee11b6a37bd730b538b2e5ee..67425dc0359ee9774200e1a2e12913d570117e7c 100644 (file)
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -9,8 +9,9 @@ git-format-patch - Prepare patches for e-mail submission
 SYNOPSIS
 --------
 [verse]
-'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--attach]
+'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--attach] [--thread]
                   [-s | --signoff] [--diff-options] [--start-number <n>]
+                  [--in-reply-to=Message-Id]
                   <since>[..<until>]
 
 DESCRIPTION
@@ -35,6 +36,10 @@ they are created in the current working directory.
 If -n is specified, instead of "[PATCH] Subject", the first line
 is formatted as "[PATCH n/m] Subject".
 
+If given --thread, git-format-patch will generate In-Reply-To and
+References headers to make the second and subsequent patch mails appear
+as replies to the first mail; this also generates a Message-Id header to
+reference.
 
 OPTIONS
 -------
@@ -63,6 +68,15 @@ OPTIONS
 --attach::
        Create attachments instead of inlining patches.
 
+--thread::
+       Add In-Reply-To and References headers to make the second and
+       subsequent mails appear as replies to the first.  Also generates
+       the Message-Id header to reference.
+
+--in-reply-to=Message-Id::
+       Make the first mail (or all the mails with --no-thread) appear as a
+       reply to the given Message-Id, which avoids breaking threads to
+       provide a new patch series.
 
 CONFIGURATION
 -------------