From a340aaa88e7e6b3c6e57e248e0c3a67e8b9067a3 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Thu, 23 Nov 2006 02:47:33 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.4.4.1

---
 git-diff-tree.html | 130 +++++++++++++++++++++++++++++++++++++++++++--
 git-diff-tree.txt  |   5 +-
 git-log.html       | 128 ++++++++++++++++++++++++++++++++++++++++++--
 git-log.txt        |   4 +-
 git-rev-list.html  | 128 ++++++++++++++++++++++++++++++++++++++++++--
 git-rev-list.txt   |   6 +--
 git-show.html      | 130 +++++++++++++++++++++++++++++++++++++++++++--
 git-show.txt       |   5 +-
 pretty-formats.txt |  78 +++++++++++++++++++++++++++
 9 files changed, 582 insertions(+), 32 deletions(-)
 create mode 100644 pretty-formats.txt

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 854dc0ebb..dc0622866 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -669,14 +669,134 @@ separated with a single space are given.</p>
 </p>
 </dd>
 <dt>
---pretty[=(raw|medium|short)]
+--pretty[=<em>&lt;format&gt;</em>]
 </dt>
 <dd>
 <p>
-        This is used to control "pretty printing" format of the
-        commit message.  Without "=&lt;style&gt;", it defaults to
-        medium.
+        Pretty-prints the details of a commit.  <tt>--pretty</tt>
+        without an explicit <tt>=&lt;format&gt;</tt> defaults to <em>medium</em>.
+        If the commit is a merge, and if the pretty-format
+        is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
+        inserted before the <em>Author:</em> line.  This line begins with
+        "Merge: " and the sha1s of ancestral commits are printed,
+        separated by spaces.  Note that the listed commits may not
+        necessarily be the list of the <strong>direct</strong> parent commits if you
+        have limited your view of history: for example, if you are
+        only interested in changes related to a certain directory or
+        file.  Here are some additional details for each format:
+</p>
+<ul>
+<li>
+<p>
+<em>oneline</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;sha1&gt; &lt;title line&gt;</tt></pre>
+</div></div>
+<p>This is designed to be as compact as possible.</p>
+</li>
+<li>
+<p>
+<em>short</em>
 </p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>medium</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;
+Date: &lt;date&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>full</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;
+Commit: &lt;committer&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>fuller</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;
+AuthorDate: &lt;date &amp; time&gt;
+Commit: &lt;committer&gt;
+CommitDate: &lt;date &amp; time&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>email</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>From &lt;sha1&gt; &lt;date&gt;
+From: &lt;author&gt;
+Date: &lt;date &amp; time&gt;
+Subject: [PATCH] &lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>raw</em>
+</p>
+<p>The <em>raw</em> format shows the entire commit exactly as
+stored in the commit object.  Notably, the SHA1s are
+displayed in full, regardless of whether --abbrev or
+--no-abbrev are used, and <em>parents</em> information show the
+true parent commits, without taking grafts nor history
+simplification into account.</p>
+</li>
+</ul>
 </dd>
 <dt>
 --no-commit-id
@@ -1171,7 +1291,7 @@ two unresolved merge parents with the working tree file
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Oct-2006 09:29:02 UTC
+Last updated 23-Nov-2006 02:47:19 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-tree.txt b/git-diff-tree.txt
index f7e8ff296..5d6e9dc75 100644
--- a/git-diff-tree.txt
+++ b/git-diff-tree.txt
@@ -73,10 +73,7 @@ separated with a single space are given.
 	This flag causes "git-diff-tree --stdin" to also show
 	the commit message before the differences.
 
---pretty[=(raw|medium|short)]::
-	This is used to control "pretty printing" format of the
-	commit message.  Without "=<style>", it defaults to
-	medium.
+include::pretty-formats.txt[]
 
 --no-commit-id::
 	git-diff-tree outputs a line with the commit ID when
diff --git a/git-log.html b/git-log.html
index 11ff7c21b..081201844 100644
--- a/git-log.html
+++ b/git-log.html
@@ -287,12 +287,134 @@ each commit introduces are shown.</p>
 <div class="sectionbody">
 <dl>
 <dt>
---pretty=&lt;format&gt;
+--pretty[=<em>&lt;format&gt;</em>]
 </dt>
 <dd>
 <p>
-        Controls the way the commit log is formatted.
+        Pretty-prints the details of a commit.  <tt>--pretty</tt>
+        without an explicit <tt>=&lt;format&gt;</tt> defaults to <em>medium</em>.
+        If the commit is a merge, and if the pretty-format
+        is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
+        inserted before the <em>Author:</em> line.  This line begins with
+        "Merge: " and the sha1s of ancestral commits are printed,
+        separated by spaces.  Note that the listed commits may not
+        necessarily be the list of the <strong>direct</strong> parent commits if you
+        have limited your view of history: for example, if you are
+        only interested in changes related to a certain directory or
+        file.  Here are some additional details for each format:
 </p>
+<ul>
+<li>
+<p>
+<em>oneline</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;sha1&gt; &lt;title line&gt;</tt></pre>
+</div></div>
+<p>This is designed to be as compact as possible.</p>
+</li>
+<li>
+<p>
+<em>short</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>medium</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;
+Date: &lt;date&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>full</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;
+Commit: &lt;committer&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>fuller</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;
+AuthorDate: &lt;date &amp; time&gt;
+Commit: &lt;committer&gt;
+CommitDate: &lt;date &amp; time&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>email</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>From &lt;sha1&gt; &lt;date&gt;
+From: &lt;author&gt;
+Date: &lt;date &amp; time&gt;
+Subject: [PATCH] &lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>raw</em>
+</p>
+<p>The <em>raw</em> format shows the entire commit exactly as
+stored in the commit object.  Notably, the SHA1s are
+displayed in full, regardless of whether --abbrev or
+--no-abbrev are used, and <em>parents</em> information show the
+true parent commits, without taking grafts nor history
+simplification into account.</p>
+</li>
+</ul>
 </dd>
 <dt>
 --max-count=&lt;n&gt;
@@ -384,7 +506,7 @@ git log -r --name-status release..test
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Oct-2006 08:41:09 UTC
+Last updated 23-Nov-2006 02:47:21 UTC
 </div>
 </div>
 </body>
diff --git a/git-log.txt b/git-log.txt
index c9ffff734..79643ac92 100644
--- a/git-log.txt
+++ b/git-log.txt
@@ -24,8 +24,8 @@ This manual page describes only the most frequently used options.
 
 OPTIONS
 -------
---pretty=<format>::
-	Controls the way the commit log is formatted.
+
+include::pretty-formats.txt[]
 
 --max-count=<n>::
 	Limits the number of commits to show.
diff --git a/git-rev-list.html b/git-rev-list.html
index 1bd3ba133..b10c371f2 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -339,10 +339,130 @@ more specialized family of commit log tools: <a href="git-log.html">git-log(1)</
 </dt>
 <dd>
 <p>
-        Pretty print the contents of the commit logs in a given format,
-        where <em>&lt;format&gt;</em> can be one of <em>raw</em>, <em>medium</em>, <em>short</em>, <em>full</em>,
-        and <em>oneline</em>. When left out the format default to <em>medium</em>.
+        Pretty-prints the details of a commit.  <tt>--pretty</tt>
+        without an explicit <tt>=&lt;format&gt;</tt> defaults to <em>medium</em>.
+        If the commit is a merge, and if the pretty-format
+        is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
+        inserted before the <em>Author:</em> line.  This line begins with
+        "Merge: " and the sha1s of ancestral commits are printed,
+        separated by spaces.  Note that the listed commits may not
+        necessarily be the list of the <strong>direct</strong> parent commits if you
+        have limited your view of history: for example, if you are
+        only interested in changes related to a certain directory or
+        file.  Here are some additional details for each format:
 </p>
+<ul>
+<li>
+<p>
+<em>oneline</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;sha1&gt; &lt;title line&gt;</tt></pre>
+</div></div>
+<p>This is designed to be as compact as possible.</p>
+</li>
+<li>
+<p>
+<em>short</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>medium</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;
+Date: &lt;date&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>full</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;
+Commit: &lt;committer&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>fuller</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;
+AuthorDate: &lt;date &amp; time&gt;
+Commit: &lt;committer&gt;
+CommitDate: &lt;date &amp; time&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>email</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>From &lt;sha1&gt; &lt;date&gt;
+From: &lt;author&gt;
+Date: &lt;date &amp; time&gt;
+Subject: [PATCH] &lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>raw</em>
+</p>
+<p>The <em>raw</em> format shows the entire commit exactly as
+stored in the commit object.  Notably, the SHA1s are
+displayed in full, regardless of whether --abbrev or
+--no-abbrev are used, and <em>parents</em> information show the
+true parent commits, without taking grafts nor history
+simplification into account.</p>
+</li>
+</ul>
 </dd>
 <dt>
 --relative-date
@@ -645,7 +765,7 @@ and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Oct-2006 08:41:25 UTC
+Last updated 23-Nov-2006 02:47:21 UTC
 </div>
 </div>
 </body>
diff --git a/git-rev-list.txt b/git-rev-list.txt
index 00a95e249..ec43c0b3a 100644
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -79,11 +79,7 @@ Using these options, gitlink:git-rev-list[1] will act similar to the
 more specialized family of commit log tools: gitlink:git-log[1],
 gitlink:git-show[1], and gitlink:git-whatchanged[1]
 
---pretty[='<format>']::
-
-	Pretty print the contents of the commit logs in a given format,
-	where '<format>' can be one of 'raw', 'medium', 'short', 'full',
-	and 'oneline'. When left out the format default to 'medium'.
+include::pretty-formats.txt[]
 
 --relative-date::
 
diff --git a/git-show.html b/git-show.html
index 025f692b6..7822cc26f 100644
--- a/git-show.html
+++ b/git-show.html
@@ -295,14 +295,134 @@ format as produced by <em>git-diff-tree --cc</em>.</p>
 </p>
 </dd>
 <dt>
---pretty=&lt;format&gt;
+--pretty[=<em>&lt;format&gt;</em>]
 </dt>
 <dd>
 <p>
-        Controls the output format for the commit logs.
-        &lt;format&gt; can be one of <em>raw</em>, <em>medium</em>, <em>short</em>, <em>full</em>,
-        and <em>oneline</em>.
+        Pretty-prints the details of a commit.  <tt>--pretty</tt>
+        without an explicit <tt>=&lt;format&gt;</tt> defaults to <em>medium</em>.
+        If the commit is a merge, and if the pretty-format
+        is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
+        inserted before the <em>Author:</em> line.  This line begins with
+        "Merge: " and the sha1s of ancestral commits are printed,
+        separated by spaces.  Note that the listed commits may not
+        necessarily be the list of the <strong>direct</strong> parent commits if you
+        have limited your view of history: for example, if you are
+        only interested in changes related to a certain directory or
+        file.  Here are some additional details for each format:
 </p>
+<ul>
+<li>
+<p>
+<em>oneline</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;sha1&gt; &lt;title line&gt;</tt></pre>
+</div></div>
+<p>This is designed to be as compact as possible.</p>
+</li>
+<li>
+<p>
+<em>short</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>medium</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;
+Date: &lt;date&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>full</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;
+Commit: &lt;committer&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>fuller</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>commit &lt;sha1&gt;
+Author: &lt;author&gt;
+AuthorDate: &lt;date &amp; time&gt;
+Commit: &lt;committer&gt;
+CommitDate: &lt;date &amp; time&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>&lt;full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>email</em>
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>From &lt;sha1&gt; &lt;date&gt;
+From: &lt;author&gt;
+Date: &lt;date &amp; time&gt;
+Subject: [PATCH] &lt;title line&gt;</tt></pre>
+</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>full commit message&gt;</tt></pre>
+</div></div>
+</li>
+<li>
+<p>
+<em>raw</em>
+</p>
+<p>The <em>raw</em> format shows the entire commit exactly as
+stored in the commit object.  Notably, the SHA1s are
+displayed in full, regardless of whether --abbrev or
+--no-abbrev are used, and <em>parents</em> information show the
+true parent commits, without taking grafts nor history
+simplification into account.</p>
+</li>
+</ul>
 </dd>
 </dl>
 </div>
@@ -322,7 +442,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Oct-2006 08:41:29 UTC
+Last updated 23-Nov-2006 02:47:22 UTC
 </div>
 </div>
 </body>
diff --git a/git-show.txt b/git-show.txt
index 2b4df3f96..4c880a871 100644
--- a/git-show.txt
+++ b/git-show.txt
@@ -26,10 +26,7 @@ OPTIONS
 <commitid>::
 	ID of the commit to show.
 
---pretty=<format>::
-	Controls the output format for the commit logs.
-	<format> can be one of 'raw', 'medium', 'short', 'full',
-	and 'oneline'.
+include::pretty-formats.txt[]
 
 Author
 ------
diff --git a/pretty-formats.txt b/pretty-formats.txt
new file mode 100644
index 000000000..996f62890
--- /dev/null
+++ b/pretty-formats.txt
@@ -0,0 +1,78 @@
+--pretty[='<format>']::
+
+        Pretty-prints the details of a commit.  `--pretty`
+	without an explicit `=<format>` defaults to 'medium'.
+	If the commit is a merge, and if the pretty-format
+        is not 'oneline', 'email' or 'raw', an additional line is
+        inserted before the 'Author:' line.  This line begins with
+        "Merge: " and the sha1s of ancestral commits are printed,
+        separated by spaces.  Note that the listed commits may not
+        necessarily be the list of the *direct* parent commits if you
+        have limited your view of history: for example, if you are
+        only interested in changes related to a certain directory or
+        file.  Here are some additional details for each format:
+
+        * 'oneline'
+
+	  <sha1> <title line>
++
+This is designed to be as compact as possible.
+
+        * 'short'
+
+	  commit <sha1>
+	  Author: <author>
+
+	      <title line>
+
+        * 'medium'
+
+	  commit <sha1>
+	  Author: <author>
+	  Date: <date>
+
+	      <title line>
+
+	      <full commit message>
+
+        * 'full'
+
+	  commit <sha1>
+	  Author: <author>
+	  Commit: <committer>
+
+	      <title line>
+
+	      <full commit message>
+
+        * 'fuller'
+
+	  commit <sha1>
+	  Author: <author>
+	  AuthorDate: <date & time>
+	  Commit: <committer>
+	  CommitDate: <date & time>
+
+	       <title line>
+
+	       <full commit message>
+
+
+        * 'email'
+
+	  From <sha1> <date>
+	  From: <author>
+	  Date: <date & time>
+	  Subject: [PATCH] <title line>
+
+	  full commit message>
+
+
+	* 'raw'
++
+The 'raw' format shows the entire commit exactly as
+stored in the commit object.  Notably, the SHA1s are
+displayed in full, regardless of whether --abbrev or
+--no-abbrev are used, and 'parents' information show the
+true parent commits, without taking grafts nor history
+simplification into account.
-- 
2.26.2