Autogenerated HTML docs for v1.4.4.1

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 854dc0ebba89706b011d5ce22af3f62d74c30879..dc0622866ca88b697e145ec899abc9e514359c54 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -669,14 +669,134 @@ separated with a single space are given.</p>
 </p>\r
 </dd>\r
 <dt>\r
---pretty[=(raw|medium|short)]\r
+--pretty[=<em>&lt;format&gt;</em>]\r
 </dt>\r
 <dd>\r
 <p>\r
-        This is used to control "pretty printing" format of the\r
-        commit message.  Without "=&lt;style&gt;", it defaults to\r
-        medium.\r
+        Pretty-prints the details of a commit.  <tt>--pretty</tt>\r
+        without an explicit <tt>=&lt;format&gt;</tt> defaults to <em>medium</em>.\r
+        If the commit is a merge, and if the pretty-format\r
+        is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is\r
+        inserted before the <em>Author:</em> line.  This line begins with\r
+        "Merge: " and the sha1s of ancestral commits are printed,\r
+        separated by spaces.  Note that the listed commits may not\r
+        necessarily be the list of the <strong>direct</strong> parent commits if you\r
+        have limited your view of history: for example, if you are\r
+        only interested in changes related to a certain directory or\r
+        file.  Here are some additional details for each format:\r
+</p>\r
+<ul>\r
+<li>\r
+<p>\r
+<em>oneline</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;sha1&gt; &lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<p>This is designed to be as compact as possible.</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>short</em>\r
 </p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>medium</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+Date: &lt;date&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>full</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+Commit: &lt;committer&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>fuller</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+AuthorDate: &lt;date &amp; time&gt;\r
+Commit: &lt;committer&gt;\r
+CommitDate: &lt;date &amp; time&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>email</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>From &lt;sha1&gt; &lt;date&gt;\r
+From: &lt;author&gt;\r
+Date: &lt;date &amp; time&gt;\r
+Subject: [PATCH] &lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>raw</em>\r
+</p>\r
+<p>The <em>raw</em> format shows the entire commit exactly as\r
+stored in the commit object.  Notably, the SHA1s are\r
+displayed in full, regardless of whether --abbrev or\r
+--no-abbrev are used, and <em>parents</em> information show the\r
+true parent commits, without taking grafts nor history\r
+simplification into account.</p>\r
+</li>\r
+</ul>\r
 </dd>\r
 <dt>\r
 --no-commit-id\r
@@ -1171,7 +1291,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 27-Oct-2006 09:29:02 UTC\r
+Last updated 23-Nov-2006 02:47:19 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.txt b/git-diff-tree.txt
index f7e8ff2968d6c443220ea9e9667255ebdd29b602..5d6e9dc751aef6e30582b399ae09f81c043e6de1 100644 (file)
--- 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 11ff7c21ba2f5b46664a7bba5b06927991f779b8..081201844831029562b4e5fb777890c29128af0d 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -287,12 +287,134 @@ each commit introduces are shown.</p>
 <div class="sectionbody">\r
 <dl>\r
 <dt>\r
---pretty=&lt;format&gt;\r
+--pretty[=<em>&lt;format&gt;</em>]\r
 </dt>\r
 <dd>\r
 <p>\r
-        Controls the way the commit log is formatted.\r
+        Pretty-prints the details of a commit.  <tt>--pretty</tt>\r
+        without an explicit <tt>=&lt;format&gt;</tt> defaults to <em>medium</em>.\r
+        If the commit is a merge, and if the pretty-format\r
+        is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is\r
+        inserted before the <em>Author:</em> line.  This line begins with\r
+        "Merge: " and the sha1s of ancestral commits are printed,\r
+        separated by spaces.  Note that the listed commits may not\r
+        necessarily be the list of the <strong>direct</strong> parent commits if you\r
+        have limited your view of history: for example, if you are\r
+        only interested in changes related to a certain directory or\r
+        file.  Here are some additional details for each format:\r
 </p>\r
+<ul>\r
+<li>\r
+<p>\r
+<em>oneline</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;sha1&gt; &lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<p>This is designed to be as compact as possible.</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>short</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>medium</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+Date: &lt;date&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>full</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+Commit: &lt;committer&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>fuller</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+AuthorDate: &lt;date &amp; time&gt;\r
+Commit: &lt;committer&gt;\r
+CommitDate: &lt;date &amp; time&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>email</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>From &lt;sha1&gt; &lt;date&gt;\r
+From: &lt;author&gt;\r
+Date: &lt;date &amp; time&gt;\r
+Subject: [PATCH] &lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>raw</em>\r
+</p>\r
+<p>The <em>raw</em> format shows the entire commit exactly as\r
+stored in the commit object.  Notably, the SHA1s are\r
+displayed in full, regardless of whether --abbrev or\r
+--no-abbrev are used, and <em>parents</em> information show the\r
+true parent commits, without taking grafts nor history\r
+simplification into account.</p>\r
+</li>\r
+</ul>\r
 </dd>\r
 <dt>\r
 --max-count=&lt;n&gt;\r
@@ -384,7 +506,7 @@ git log -r --name-status release..test
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:09 UTC\r
+Last updated 23-Nov-2006 02:47:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.txt b/git-log.txt
index c9ffff734c256d7db1470381f0eb74a8d7f81873..79643ac928b05b4a97a09a5adfb67b1b4a2b832c 100644 (file)
--- 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 1bd3ba133889f1a4724f27f3967a4a2038720b5a..b10c371f21d5afaacfa70bfec02e226f8e8874a6 100644 (file)
--- 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>\r
 <dd>\r
 <p>\r
-        Pretty print the contents of the commit logs in a given format,\r
-        where <em>&lt;format&gt;</em> can be one of <em>raw</em>, <em>medium</em>, <em>short</em>, <em>full</em>,\r
-        and <em>oneline</em>. When left out the format default to <em>medium</em>.\r
+        Pretty-prints the details of a commit.  <tt>--pretty</tt>\r
+        without an explicit <tt>=&lt;format&gt;</tt> defaults to <em>medium</em>.\r
+        If the commit is a merge, and if the pretty-format\r
+        is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is\r
+        inserted before the <em>Author:</em> line.  This line begins with\r
+        "Merge: " and the sha1s of ancestral commits are printed,\r
+        separated by spaces.  Note that the listed commits may not\r
+        necessarily be the list of the <strong>direct</strong> parent commits if you\r
+        have limited your view of history: for example, if you are\r
+        only interested in changes related to a certain directory or\r
+        file.  Here are some additional details for each format:\r
 </p>\r
+<ul>\r
+<li>\r
+<p>\r
+<em>oneline</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;sha1&gt; &lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<p>This is designed to be as compact as possible.</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>short</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>medium</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+Date: &lt;date&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>full</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+Commit: &lt;committer&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>fuller</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+AuthorDate: &lt;date &amp; time&gt;\r
+Commit: &lt;committer&gt;\r
+CommitDate: &lt;date &amp; time&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>email</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>From &lt;sha1&gt; &lt;date&gt;\r
+From: &lt;author&gt;\r
+Date: &lt;date &amp; time&gt;\r
+Subject: [PATCH] &lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>raw</em>\r
+</p>\r
+<p>The <em>raw</em> format shows the entire commit exactly as\r
+stored in the commit object.  Notably, the SHA1s are\r
+displayed in full, regardless of whether --abbrev or\r
+--no-abbrev are used, and <em>parents</em> information show the\r
+true parent commits, without taking grafts nor history\r
+simplification into account.</p>\r
+</li>\r
+</ul>\r
 </dd>\r
 <dt>\r
 --relative-date\r
@@ -645,7 +765,7 @@ and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:25 UTC\r
+Last updated 23-Nov-2006 02:47:21 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.txt b/git-rev-list.txt
index 00a95e249fe82f2eb3d53dcc541559dceb3e8709..ec43c0b3a8ca87c2bd0116e1a20061eda3ca3f21 100644 (file)
--- 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 025f692b6d0a5fa234a60045d579df1552e68b5a..7822cc26fd40f0685ce4af16f2b32c6fbec17772 100644 (file)
--- a/git-show.html
+++ b/git-show.html
@@ -295,14 +295,134 @@ format as produced by <em>git-diff-tree --cc</em>.</p>
 </p>\r
 </dd>\r
 <dt>\r
---pretty=&lt;format&gt;\r
+--pretty[=<em>&lt;format&gt;</em>]\r
 </dt>\r
 <dd>\r
 <p>\r
-        Controls the output format for the commit logs.\r
-        &lt;format&gt; can be one of <em>raw</em>, <em>medium</em>, <em>short</em>, <em>full</em>,\r
-        and <em>oneline</em>.\r
+        Pretty-prints the details of a commit.  <tt>--pretty</tt>\r
+        without an explicit <tt>=&lt;format&gt;</tt> defaults to <em>medium</em>.\r
+        If the commit is a merge, and if the pretty-format\r
+        is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is\r
+        inserted before the <em>Author:</em> line.  This line begins with\r
+        "Merge: " and the sha1s of ancestral commits are printed,\r
+        separated by spaces.  Note that the listed commits may not\r
+        necessarily be the list of the <strong>direct</strong> parent commits if you\r
+        have limited your view of history: for example, if you are\r
+        only interested in changes related to a certain directory or\r
+        file.  Here are some additional details for each format:\r
 </p>\r
+<ul>\r
+<li>\r
+<p>\r
+<em>oneline</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;sha1&gt; &lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<p>This is designed to be as compact as possible.</p>\r
+</li>\r
+<li>\r
+<p>\r
+<em>short</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>medium</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+Date: &lt;date&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>full</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+Commit: &lt;committer&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>fuller</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>commit &lt;sha1&gt;\r
+Author: &lt;author&gt;\r
+AuthorDate: &lt;date &amp; time&gt;\r
+Commit: &lt;committer&gt;\r
+CommitDate: &lt;date &amp; time&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>&lt;full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>email</em>\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>From &lt;sha1&gt; &lt;date&gt;\r
+From: &lt;author&gt;\r
+Date: &lt;date &amp; time&gt;\r
+Subject: [PATCH] &lt;title line&gt;</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>full commit message&gt;</tt></pre>\r
+</div></div>\r
+</li>\r
+<li>\r
+<p>\r
+<em>raw</em>\r
+</p>\r
+<p>The <em>raw</em> format shows the entire commit exactly as\r
+stored in the commit object.  Notably, the SHA1s are\r
+displayed in full, regardless of whether --abbrev or\r
+--no-abbrev are used, and <em>parents</em> information show the\r
+true parent commits, without taking grafts nor history\r
+simplification into account.</p>\r
+</li>\r
+</ul>\r
 </dd>\r
 </dl>\r
 </div>\r
@@ -322,7 +442,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:29 UTC\r
+Last updated 23-Nov-2006 02:47:22 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-show.txt b/git-show.txt
index 2b4df3f96f76dd023721ab03a149afd6ed8c5dd8..4c880a871792a64355ac94537af934aca14879ec 100644 (file)
--- 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 (file)
index 0000000..996f628
--- /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.