From: Junio C Hamano <junio@hera.kernel.org>
Date: Tue, 7 Feb 2006 10:24:35 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.1.6-g53f3
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=38de0a20e4278879b4b5f05c246a852ca570ba45;p=git.git

Autogenerated HTML docs for v1.1.6-g53f3
---

diff --git a/git-format-patch.html b/git-format-patch.html
index 9da28602..54c3f2dd 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -273,24 +273,23 @@ git-format-patch(1) Manual Page
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<div class="content"><em>git-format-patch</em> [-n | -k] [-o &lt;dir&gt; | --stdout] [-s] [-c] [--mbox]
+<div class="content"><em>git-format-patch</em> [-n | -k] [-o &lt;dir&gt; | --stdout] [-s] [-c]
                  [--diff-options] &lt;his&gt; [&lt;mine&gt;]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
 <p>Prepare each commit with its patch since &lt;mine&gt; head forked from
-&lt;his&gt; head, one file per patch, for e-mail submission.  Each
-output file is numbered sequentially from 1, and uses the first
-line of the commit message (massaged for pathname safety) as the
-filename.</p>
-<p>When -o is specified, output files are created in that
-directory; otherwise in the current working directory.</p>
+&lt;his&gt; head, one file per patch formatted to resemble UNIX mailbox
+format, for e-mail submission or use with <a href="git-am.html">git-am(1)</a>.</p>
+<p>Each output file is numbered sequentially from 1, and uses the
+first line of the commit message (massaged for pathname safety)
+as the filename.</p>
+<p>When -o is specified, output files are created in &lt;dir&gt;; otherwise
+they are created in the current working directory.  This option
+is ignored if --stdout is specified.</p>
 <p>When -n is specified, instead of "[PATCH] Subject", the first
 line is formatted as "[PATCH N/M] Subject", unless you have only
 one patch.</p>
-<p>When --mbox is specified, the output is formatted to resemble
-UNIX mailbox format, and can be concatenated together for
-processing with applymbox.</p>
 </div>
 <h2>OPTIONS</h2>
 <div class="sectionbody">
@@ -322,16 +321,6 @@ processing with applymbox.</p>
 </p>
 </dd>
 <dt>
--a|--author, -d|--date
-</dt>
-<dd>
-<p>
-        Output From: and Date: headers for commits made by
-        yourself as well.  Usually these are output only for
-        commits made by people other than yourself.
-</p>
-</dd>
-<dt>
 -s|--signoff
 </dt>
 <dd>
@@ -353,17 +342,6 @@ processing with applymbox.</p>
 </p>
 </dd>
 <dt>
--m|--mbox
-</dt>
-<dd>
-<p>
-        Format the output files for closer to mbox format by
-        adding a phony Unix "From " line, so they can be
-        concatenated together and fed to <tt>git-applymbox</tt>.
-        Implies --author and --date.
-</p>
-</dd>
-<dt>
 --stdout
 </dt>
 <dd>
@@ -432,7 +410,7 @@ git-format-patch -M -B origin
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 06-Jan-2006 17:12:29 PDT
+Last updated 07-Feb-2006 10:24:33 UTC
 </div>
 </div>
 </body>
diff --git a/git-format-patch.txt b/git-format-patch.txt
index 47705de4..9ac06368 100644
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -9,28 +9,27 @@ git-format-patch - Prepare patches for e-mail submission.
 SYNOPSIS
 --------
 [verse]
-'git-format-patch' [-n | -k] [-o <dir> | --stdout] [-s] [-c] [--mbox]
+'git-format-patch' [-n | -k] [-o <dir> | --stdout] [-s] [-c]
 		 [--diff-options] <his> [<mine>]
 
 DESCRIPTION
 -----------
 Prepare each commit with its patch since <mine> head forked from
-<his> head, one file per patch, for e-mail submission.  Each
-output file is numbered sequentially from 1, and uses the first
-line of the commit message (massaged for pathname safety) as the
-filename.
+<his> head, one file per patch formatted to resemble UNIX mailbox
+format, for e-mail submission or use with gitlink:git-am[1].
 
-When -o is specified, output files are created in that
-directory; otherwise in the current working directory.
+Each output file is numbered sequentially from 1, and uses the
+first line of the commit message (massaged for pathname safety)
+as the filename.
+
+When -o is specified, output files are created in <dir>; otherwise
+they are created in the current working directory.  This option
+is ignored if --stdout is specified.
 
 When -n is specified, instead of "[PATCH] Subject", the first
 line is formatted as "[PATCH N/M] Subject", unless you have only
 one patch.
 
-When --mbox is specified, the output is formatted to resemble
-UNIX mailbox format, and can be concatenated together for
-processing with applymbox.
-
 
 OPTIONS
 -------
@@ -45,11 +44,6 @@ OPTIONS
 	Do not strip/add '[PATCH]' from the first line of the
 	commit log message.
 
--a|--author, -d|--date::
-	Output From: and Date: headers for commits made by
-	yourself as well.  Usually these are output only for
-	commits made by people other than yourself.
-
 -s|--signoff::
 	Add `Signed-off-by:` line to the commit message, using
 	the committer identity of yourself.
@@ -61,12 +55,6 @@ OPTIONS
         has a SP character immediately followed by a TAB
         character.
 
--m|--mbox::
-	Format the output files for closer to mbox format by
-	adding a phony Unix "From " line, so they can be
-	concatenated together and fed to `git-applymbox`.
-	Implies --author and --date.
-
 --stdout::
 	This flag generates the mbox formatted output to the
 	standard output, instead of saving them into a file per
