Autogenerated HTML docs for v1.3.0-rc3-gd53352

diff --git a/diff-options.txt b/diff-options.txt
index ec6811c..338014c 100644 (file)
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -4,6 +4,9 @@
 -u::
        Synonym for "-p".
 
+--patch-with-raw::
+       Generate patch but keep also the default raw diff output.
+
 -z::
        \0 line termination on output
 

diff --git a/git-apply.html b/git-apply.html
index e809b6e..497d563 100644 (file)
--- a/git-apply.html
+++ b/git-apply.html
@@ -275,7 +275,7 @@ git-apply(1) Manual Page
 <div class="verseblock">\r
 <div class="content"><em>git-apply</em> [--stat] [--numstat] [--summary] [--check] [--index] [--apply]\r
           [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM]\r
-          [--whitespace=&lt;nowarn|warn|error|error-all|strip&gt;]\r
+          [-CNUM] [--whitespace=&lt;nowarn|warn|error|error-all|strip&gt;]\r
           [&lt;patch&gt;&#8230;]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
@@ -384,6 +384,17 @@ and a work tree.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-C&lt;n&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Ensure at least &lt;n&gt; lines of surrounding context match before\r
+        and after each change.  When fewer lines of surrounding\r
+        context exist they all most match.  By default no context is\r
+        ever ignored.\r
+</p>\r
+</dd>\r
+<dt>\r
 --apply\r
 </dt>\r
 <dd>\r
@@ -499,7 +510,7 @@ apply.whitespace
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 02-Mar-2006 09:14:48 UTC\r
+Last updated 13-Apr-2006 07:45:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-apply.txt b/git-apply.txt
index 1c64a1a..e93ea1f 100644 (file)
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply]
          [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM]
-         [--whitespace=<nowarn|warn|error|error-all|strip>]
+         [-CNUM] [--whitespace=<nowarn|warn|error|error-all|strip>]
          [<patch>...]
 
 DESCRIPTION
@@ -73,6 +73,12 @@ OPTIONS
        Remove <n> leading slashes from traditional diff paths. The
        default is 1.
 
+-C<n>::
+       Ensure at least <n> lines of surrounding context match before
+       and after each change.  When fewer lines of surrounding
+       context exist they all most match.  By default no context is
+       ever ignored.
+
 --apply::
        If you use any of the options marked ``Turns off
        "apply"'' above, git-apply reads and outputs the

diff --git a/git-diff-files.html b/git-diff-files.html
index 6af9abe..43afec5 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -301,6 +301,14 @@ same as "git-diff-index" and "git-diff-tree".</p>
 </p>\r
 </dd>\r
 <dt>\r
+--patch-with-raw\r
+</dt>\r
+<dd>\r
+<p>\r
+        Generate patch but keep also the default raw diff output.\r
+</p>\r
+</dd>\r
+<dt>\r
 -z\r
 </dt>\r
 <dd>\r
@@ -814,7 +822,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 05-Apr-2006 21:43:18 UTC\r
+Last updated 13-Apr-2006 07:45:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index 8e07587..30c3638 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -302,6 +302,14 @@ entries in the index are compared.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--patch-with-raw\r
+</dt>\r
+<dd>\r
+<p>\r
+        Generate patch but keep also the default raw diff output.\r
+</p>\r
+</dd>\r
+<dt>\r
 -z\r
 </dt>\r
 <dd>\r
@@ -904,7 +912,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 05-Apr-2006 21:43:19 UTC\r
+Last updated 13-Apr-2006 07:45:01 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-stages.html b/git-diff-stages.html
index 1fd8955..7dc28f9 100644 (file)
--- a/git-diff-stages.html
+++ b/git-diff-stages.html
@@ -299,6 +299,14 @@ unmerged index file.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--patch-with-raw\r
+</dt>\r
+<dd>\r
+<p>\r
+        Generate patch but keep also the default raw diff output.\r
+</p>\r
+</dd>\r
+<dt>\r
 -z\r
 </dt>\r
 <dd>\r
@@ -788,7 +796,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 05-Apr-2006 21:43:19 UTC\r
+Last updated 13-Apr-2006 07:45:02 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index f616fd6..0c6660b 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -304,6 +304,14 @@ git-diff-tree(1) Manual Page
 </p>\r
 </dd>\r
 <dt>\r
+--patch-with-raw\r
+</dt>\r
+<dd>\r
+<p>\r
+        Generate patch but keep also the default raw diff output.\r
+</p>\r
+</dd>\r
+<dt>\r
 -z\r
 </dt>\r
 <dd>\r
@@ -976,7 +984,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Apr-2006 23:46:08 UTC\r
+Last updated 13-Apr-2006 07:45:03 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge-tree.html b/git-merge-tree.html
new file mode 100644 (file)
index 0000000..2ea075a
--- /dev/null
+++ b/git-merge-tree.html
@@ -0,0 +1,307 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
+<head>\r
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<style type="text/css">\r
+/* Debug borders */\r
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
+/*\r
+  border: 1px solid red;\r
+*/\r
+}\r
+\r
+body {\r
+  margin: 1em 5% 1em 5%;\r
+}\r
+\r
+a { color: blue; }\r
+a:visited { color: fuchsia; }\r
+\r
+em {\r
+  font-style: italic;\r
+}\r
+\r
+strong {\r
+  font-weight: bold;\r
+}\r
+\r
+tt {\r
+  color: navy;\r
+}\r
+\r
+h1, h2, h3, h4, h5, h6 {\r
+  color: #527bbd;\r
+  font-family: sans-serif;\r
+  margin-top: 1.2em;\r
+  margin-bottom: 0.5em;\r
+  line-height: 1.3;\r
+}\r
+\r
+h1 {\r
+  border-bottom: 2px solid silver;\r
+}\r
+h2 {\r
+  border-bottom: 2px solid silver;\r
+  padding-top: 0.5em;\r
+}\r
+\r
+div.sectionbody {\r
+  font-family: serif;\r
+  margin-left: 0;\r
+}\r
+\r
+hr {\r
+  border: 1px solid silver;\r
+}\r
+\r
+p {\r
+  margin-top: 0.5em;\r
+  margin-bottom: 0.5em;\r
+}\r
+\r
+pre {\r
+  padding: 0;\r
+  margin: 0;\r
+}\r
+\r
+span#author {\r
+  color: #527bbd;\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  font-size: 1.2em;\r
+}\r
+span#email {\r
+}\r
+span#revision {\r
+  font-family: sans-serif;\r
+}\r
+\r
+div#footer {\r
+  font-family: sans-serif;\r
+  font-size: small;\r
+  border-top: 2px solid silver;\r
+  padding-top: 0.5em;\r
+  margin-top: 4.0em;\r
+}\r
+div#footer-text {\r
+  float: left;\r
+  padding-bottom: 0.5em;\r
+}\r
+div#footer-badges {\r
+  float: right;\r
+  padding-bottom: 0.5em;\r
+}\r
+\r
+div#preamble,\r
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,\r
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,\r
+div.admonitionblock {\r
+  margin-right: 10%;\r
+  margin-top: 1.5em;\r
+  margin-bottom: 1.5em;\r
+}\r
+div.admonitionblock {\r
+  margin-top: 2.5em;\r
+  margin-bottom: 2.5em;\r
+}\r
+\r
+div.content { /* Block element content. */\r
+  padding: 0;\r
+}\r
+\r
+/* Block element titles. */\r
+div.title, caption.title {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  text-align: left;\r
+  margin-top: 1.0em;\r
+  margin-bottom: 0.5em;\r
+}\r
+div.title + * {\r
+  margin-top: 0;\r
+}\r
+\r
+td div.title:first-child {\r
+  margin-top: 0.0em;\r
+}\r
+div.content div.title:first-child {\r
+  margin-top: 0.0em;\r
+}\r
+div.content + div.title {\r
+  margin-top: 0.0em;\r
+}\r
+\r
+div.sidebarblock > div.content {\r
+  background: #ffffee;\r
+  border: 1px solid silver;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.listingblock > div.content {\r
+  border: 1px solid silver;\r
+  background: #f4f4f4;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.quoteblock > div.content {\r
+  padding-left: 2.0em;\r
+}\r
+div.quoteblock .attribution {\r
+  text-align: right;\r
+}\r
+\r
+div.admonitionblock .icon {\r
+  vertical-align: top;\r
+  font-size: 1.1em;\r
+  font-weight: bold;\r
+  text-decoration: underline;\r
+  color: #527bbd;\r
+  padding-right: 0.5em;\r
+}\r
+div.admonitionblock td.content {\r
+  padding-left: 0.5em;\r
+  border-left: 2px solid silver;\r
+}\r
+\r
+div.exampleblock > div.content {\r
+  border-left: 2px solid silver;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.verseblock div.content {\r
+  white-space: pre;\r
+}\r
+\r
+div.imageblock div.content { padding-left: 0; }\r
+div.imageblock img { border: 1px solid silver; }\r
+span.image img { border-style: none; }\r
+\r
+dl {\r
+  margin-top: 0.8em;\r
+  margin-bottom: 0.8em;\r
+}\r
+dt {\r
+  margin-top: 0.5em;\r
+  margin-bottom: 0;\r
+  font-style: italic;\r
+}\r
+dd > *:first-child {\r
+  margin-top: 0;\r
+}\r
+\r
+ul, ol {\r
+    list-style-position: outside;\r
+}\r
+ol.olist2 {\r
+  list-style-type: lower-alpha;\r
+}\r
+\r
+div.tableblock > table {\r
+  border-color: #527bbd;\r
+  border-width: 3px;\r
+}\r
+thead {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+}\r
+tfoot {\r
+  font-weight: bold;\r
+}\r
+\r
+div.hlist {\r
+  margin-top: 0.8em;\r
+  margin-bottom: 0.8em;\r
+}\r
+td.hlist1 {\r
+  vertical-align: top;\r
+  font-style: italic;\r
+  padding-right: 0.8em;\r
+}\r
+td.hlist2 {\r
+  vertical-align: top;\r
+}\r
+\r
+@media print {\r
+  div#footer-badges { display: none; }\r
+}\r
+include::./stylesheets/xhtml11-manpage.css[]\r
+/* Workarounds for IE6's broken and incomplete CSS2. */\r
+\r
+div.sidebar-content {\r
+  background: #ffffee;\r
+  border: 1px solid silver;\r
+  padding: 0.5em;\r
+}\r
+div.sidebar-title, div.image-title {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  margin-top: 0.0em;\r
+  margin-bottom: 0.5em;\r
+}\r
+\r
+div.listingblock div.content {\r
+  border: 1px solid silver;\r
+  background: #f4f4f4;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.quoteblock-content {\r
+  padding-left: 2.0em;\r
+}\r
+\r
+div.exampleblock-content {\r
+  border-left: 2px solid silver;\r
+  padding-left: 0.5em;\r
+}\r
+</style>\r
+<title>git-merge-tree(1)</title>\r
+</head>\r
+<body>\r
+<div id="header">\r
+<h1>\r
+git-merge-tree(1) Manual Page\r
+</h1>\r
+<h2>NAME</h2>\r
+<div class="sectionbody">\r
+<p>git-merge-tree -\r
+   Show three-way merge without touching index\r
+</p>\r
+</div>\r
+</div>\r
+<h2>SYNOPSIS</h2>\r
+<div class="sectionbody">\r
+<p><em>git-merge-tree</em> &lt;base-tree&gt; &lt;branch1&gt; &lt;branch2&gt;</p>\r
+</div>\r
+<h2>DESCRIPTION</h2>\r
+<div class="sectionbody">\r
+<p>Reads three treeish, and output trivial merge results and\r
+conflicting stages to the standard output.  This is similar to\r
+what three-way read-tree -m does, but instead of storing the\r
+results in the index, the command outputs the entries to the\r
+standard output.</p>\r
+<p>This is meant to be used by higher level scripts to compute\r
+merge results outside index, and stuff the results back into the\r
+index.  For this reason, the output from the command omits\r
+entries that match &lt;branch1&gt; tree.</p>\r
+</div>\r
+<h2>Author</h2>\r
+<div class="sectionbody">\r
+<p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>\r
+</div>\r
+<h2>Documentation</h2>\r
+<div class="sectionbody">\r
+<p>Documentation by Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>\r
+</div>\r
+<h2>GIT</h2>\r
+<div class="sectionbody">\r
+<p>Part of the <a href="git.html">git(7)</a> suite</p>\r
+</div>\r
+<div id="footer">\r
+<div id="footer-text">\r
+Last updated 13-Apr-2006 07:45:04 UTC\r
+</div>\r
+</div>\r
+</body>\r
+</html>\r

diff --git a/git-merge-tree.txt b/git-merge-tree.txt
new file mode 100644 (file)
index 0000000..35fb4fb
--- /dev/null
+++ b/git-merge-tree.txt
@@ -0,0 +1,37 @@
+git-merge-tree(1)
+=================
+
+NAME
+----
+git-merge-tree - Show three-way merge without touching index
+
+
+SYNOPSIS
+--------
+'git-merge-tree' <base-tree> <branch1> <branch2>
+
+DESCRIPTION
+-----------
+Reads three treeish, and output trivial merge results and
+conflicting stages to the standard output.  This is similar to
+what three-way read-tree -m does, but instead of storing the
+results in the index, the command outputs the entries to the
+standard output.
+
+This is meant to be used by higher level scripts to compute
+merge results outside index, and stuff the results back into the
+index.  For this reason, the output from the command omits
+entries that match <branch1> tree.
+
+Author
+------
+Written by Linus Torvalds <torvalds@osdl.org>
+
+Documentation
+--------------
+Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
+
+GIT
+---
+Part of the gitlink:git[7] suite
+

diff --git a/git-mktree.html b/git-mktree.html
new file mode 100644 (file)
index 0000000..1123f7e
--- /dev/null
+++ b/git-mktree.html
@@ -0,0 +1,314 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
+<head>\r
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<style type="text/css">\r
+/* Debug borders */\r
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
+/*\r
+  border: 1px solid red;\r
+*/\r
+}\r
+\r
+body {\r
+  margin: 1em 5% 1em 5%;\r
+}\r
+\r
+a { color: blue; }\r
+a:visited { color: fuchsia; }\r
+\r
+em {\r
+  font-style: italic;\r
+}\r
+\r
+strong {\r
+  font-weight: bold;\r
+}\r
+\r
+tt {\r
+  color: navy;\r
+}\r
+\r
+h1, h2, h3, h4, h5, h6 {\r
+  color: #527bbd;\r
+  font-family: sans-serif;\r
+  margin-top: 1.2em;\r
+  margin-bottom: 0.5em;\r
+  line-height: 1.3;\r
+}\r
+\r
+h1 {\r
+  border-bottom: 2px solid silver;\r
+}\r
+h2 {\r
+  border-bottom: 2px solid silver;\r
+  padding-top: 0.5em;\r
+}\r
+\r
+div.sectionbody {\r
+  font-family: serif;\r
+  margin-left: 0;\r
+}\r
+\r
+hr {\r
+  border: 1px solid silver;\r
+}\r
+\r
+p {\r
+  margin-top: 0.5em;\r
+  margin-bottom: 0.5em;\r
+}\r
+\r
+pre {\r
+  padding: 0;\r
+  margin: 0;\r
+}\r
+\r
+span#author {\r
+  color: #527bbd;\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  font-size: 1.2em;\r
+}\r
+span#email {\r
+}\r
+span#revision {\r
+  font-family: sans-serif;\r
+}\r
+\r
+div#footer {\r
+  font-family: sans-serif;\r
+  font-size: small;\r
+  border-top: 2px solid silver;\r
+  padding-top: 0.5em;\r
+  margin-top: 4.0em;\r
+}\r
+div#footer-text {\r
+  float: left;\r
+  padding-bottom: 0.5em;\r
+}\r
+div#footer-badges {\r
+  float: right;\r
+  padding-bottom: 0.5em;\r
+}\r
+\r
+div#preamble,\r
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,\r
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,\r
+div.admonitionblock {\r
+  margin-right: 10%;\r
+  margin-top: 1.5em;\r
+  margin-bottom: 1.5em;\r
+}\r
+div.admonitionblock {\r
+  margin-top: 2.5em;\r
+  margin-bottom: 2.5em;\r
+}\r
+\r
+div.content { /* Block element content. */\r
+  padding: 0;\r
+}\r
+\r
+/* Block element titles. */\r
+div.title, caption.title {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  text-align: left;\r
+  margin-top: 1.0em;\r
+  margin-bottom: 0.5em;\r
+}\r
+div.title + * {\r
+  margin-top: 0;\r
+}\r
+\r
+td div.title:first-child {\r
+  margin-top: 0.0em;\r
+}\r
+div.content div.title:first-child {\r
+  margin-top: 0.0em;\r
+}\r
+div.content + div.title {\r
+  margin-top: 0.0em;\r
+}\r
+\r
+div.sidebarblock > div.content {\r
+  background: #ffffee;\r
+  border: 1px solid silver;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.listingblock > div.content {\r
+  border: 1px solid silver;\r
+  background: #f4f4f4;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.quoteblock > div.content {\r
+  padding-left: 2.0em;\r
+}\r
+div.quoteblock .attribution {\r
+  text-align: right;\r
+}\r
+\r
+div.admonitionblock .icon {\r
+  vertical-align: top;\r
+  font-size: 1.1em;\r
+  font-weight: bold;\r
+  text-decoration: underline;\r
+  color: #527bbd;\r
+  padding-right: 0.5em;\r
+}\r
+div.admonitionblock td.content {\r
+  padding-left: 0.5em;\r
+  border-left: 2px solid silver;\r
+}\r
+\r
+div.exampleblock > div.content {\r
+  border-left: 2px solid silver;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.verseblock div.content {\r
+  white-space: pre;\r
+}\r
+\r
+div.imageblock div.content { padding-left: 0; }\r
+div.imageblock img { border: 1px solid silver; }\r
+span.image img { border-style: none; }\r
+\r
+dl {\r
+  margin-top: 0.8em;\r
+  margin-bottom: 0.8em;\r
+}\r
+dt {\r
+  margin-top: 0.5em;\r
+  margin-bottom: 0;\r
+  font-style: italic;\r
+}\r
+dd > *:first-child {\r
+  margin-top: 0;\r
+}\r
+\r
+ul, ol {\r
+    list-style-position: outside;\r
+}\r
+ol.olist2 {\r
+  list-style-type: lower-alpha;\r
+}\r
+\r
+div.tableblock > table {\r
+  border-color: #527bbd;\r
+  border-width: 3px;\r
+}\r
+thead {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+}\r
+tfoot {\r
+  font-weight: bold;\r
+}\r
+\r
+div.hlist {\r
+  margin-top: 0.8em;\r
+  margin-bottom: 0.8em;\r
+}\r
+td.hlist1 {\r
+  vertical-align: top;\r
+  font-style: italic;\r
+  padding-right: 0.8em;\r
+}\r
+td.hlist2 {\r
+  vertical-align: top;\r
+}\r
+\r
+@media print {\r
+  div#footer-badges { display: none; }\r
+}\r
+include::./stylesheets/xhtml11-manpage.css[]\r
+/* Workarounds for IE6's broken and incomplete CSS2. */\r
+\r
+div.sidebar-content {\r
+  background: #ffffee;\r
+  border: 1px solid silver;\r
+  padding: 0.5em;\r
+}\r
+div.sidebar-title, div.image-title {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  margin-top: 0.0em;\r
+  margin-bottom: 0.5em;\r
+}\r
+\r
+div.listingblock div.content {\r
+  border: 1px solid silver;\r
+  background: #f4f4f4;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.quoteblock-content {\r
+  padding-left: 2.0em;\r
+}\r
+\r
+div.exampleblock-content {\r
+  border-left: 2px solid silver;\r
+  padding-left: 0.5em;\r
+}\r
+</style>\r
+<title>git-mktree(1)</title>\r
+</head>\r
+<body>\r
+<div id="header">\r
+<h1>\r
+git-mktree(1) Manual Page\r
+</h1>\r
+<h2>NAME</h2>\r
+<div class="sectionbody">\r
+<p>git-mktree -\r
+   Build a tree-object from ls-tree formatted text\r
+</p>\r
+</div>\r
+</div>\r
+<h2>SYNOPSIS</h2>\r
+<div class="sectionbody">\r
+<p><em>git-mktree</em> [-z]</p>\r
+</div>\r
+<h2>DESCRIPTION</h2>\r
+<div class="sectionbody">\r
+<p>Reads standard input in non-recursive <tt>ls-tree</tt> output format,\r
+and creates a tree object.  The object name of the tree object\r
+built is written to the standard output.</p>\r
+</div>\r
+<h2>OPTIONS</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+-z\r
+</dt>\r
+<dd>\r
+<p>\r
+        Read the NUL-terminated <tt>ls-tree -z</tt> output instead.\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
+<h2>Author</h2>\r
+<div class="sectionbody">\r
+<p>Written by Junio C Hamano &lt;junkio@cox.net&gt;</p>\r
+</div>\r
+<h2>Documentation</h2>\r
+<div class="sectionbody">\r
+<p>Documentation by Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>\r
+</div>\r
+<h2>GIT</h2>\r
+<div class="sectionbody">\r
+<p>Part of the <a href="git.html">git(7)</a> suite</p>\r
+</div>\r
+<div id="footer">\r
+<div id="footer-text">\r
+Last updated 13-Apr-2006 07:45:04 UTC\r
+</div>\r
+</div>\r
+</body>\r
+</html>\r

diff --git a/git-mktree.txt b/git-mktree.txt
new file mode 100644 (file)
index 0000000..5f9ee60
--- /dev/null
+++ b/git-mktree.txt
@@ -0,0 +1,35 @@
+git-mktree(1)
+=============
+
+NAME
+----
+git-mktree - Build a tree-object from ls-tree formatted text
+
+
+SYNOPSIS
+--------
+'git-mktree' [-z]
+
+DESCRIPTION
+-----------
+Reads standard input in non-recursive `ls-tree` output format,
+and creates a tree object.  The object name of the tree object
+built is written to the standard output.
+
+OPTIONS
+-------
+-z::
+       Read the NUL-terminated `ls-tree -z` output instead.
+
+Author
+------
+Written by Junio C Hamano <junkio@cox.net>
+
+Documentation
+--------------
+Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
+
+GIT
+---
+Part of the gitlink:git[7] suite
+

diff --git a/git.html b/git.html
index b85f51a..9847fdc 100644 (file)
--- a/git.html
+++ b/git.html
@@ -414,6 +414,14 @@ repositories.</p>
 </p>\r
 </dd>\r
 <dt>\r
+<a href="git-mktree.html">git-mktree(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+        Build a tree-object from ls-tree formatted text.\r
+</p>\r
+</dd>\r
+<dt>\r
 <a href="git-pack-objects.html">git-pack-objects(1)</a>\r
 </dt>\r
 <dd>\r
@@ -799,6 +807,14 @@ ancillary user utilities.</p>
 </p>\r
 </dd>\r
 <dt>\r
+<a href="git-clean.html">git-clean(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+        Remove untracked files from the working tree.\r
+</p>\r
+</dd>\r
+<dt>\r
 <a href="git-clone.html">git-clone(1)</a>\r
 </dt>\r
 <dd>\r
@@ -943,6 +959,14 @@ ancillary user utilities.</p>
 </p>\r
 </dd>\r
 <dt>\r
+<a href="git-rm.html">git-rm(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+        Remove files from the working tree and from the index.\r
+</p>\r
+</dd>\r
+<dt>\r
 <a href="git-shortlog.html">git-shortlog(1)</a>\r
 </dt>\r
 <dd>\r
@@ -1035,6 +1059,14 @@ ancillary user utilities.</p>
 </p>\r
 </dd>\r
 <dt>\r
+<a href="git-cvsserver.html">git-cvsserver(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+        A CVS server emulator for git.\r
+</p>\r
+</dd>\r
+<dt>\r
 <a href="git-lost-found.html">git-lost-found(1)</a>\r
 </dt>\r
 <dd>\r
@@ -1142,6 +1174,14 @@ ancillary user utilities.</p>
 </p>\r
 </dd>\r
 <dt>\r
+<a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+        Produce a merge commit message.\r
+</p>\r
+</dd>\r
+<dt>\r
 <a href="git-get-tar-commit-id.html">git-get-tar-commit-id(1)</a>\r
 </dt>\r
 <dd>\r
@@ -1150,6 +1190,14 @@ ancillary user utilities.</p>
 </p>\r
 </dd>\r
 <dt>\r
+<a href="git-imap-send.html">git-imap-send(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+        Dump a mailbox from stdin into an imap folder.\r
+</p>\r
+</dd>\r
+<dt>\r
 <a href="git-mailinfo.html">git-mailinfo(1)</a>\r
 </dt>\r
 <dd>\r
@@ -1169,6 +1217,14 @@ ancillary user utilities.</p>
 </p>\r
 </dd>\r
 <dt>\r
+<a href="git-merge-tree.html">git-merge-tree(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+        Show three-way merge without touching index.\r
+</p>\r
+</dd>\r
+<dt>\r
 <a href="git-patch-id.html">git-patch-id(1)</a>\r
 </dt>\r
 <dd>\r
@@ -2023,7 +2079,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Apr-2006 05:33:34 UTC\r
+Last updated 13-Apr-2006 07:45:04 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index 06b2e53..03d860b 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -100,6 +100,9 @@ gitlink:git-merge-index[1]::
 gitlink:git-mktag[1]::
        Creates a tag object.
 
+gitlink:git-mktree[1]::
+       Build a tree-object from ls-tree formatted text.
+
 gitlink:git-pack-objects[1]::
        Creates a packed archive of objects.
 
@@ -265,6 +268,9 @@ gitlink:git-checkout[1]::
 gitlink:git-cherry-pick[1]::
        Cherry-pick the effect of an existing commit.
 
+gitlink:git-clean[1]::
+       Remove untracked files from the working tree.
+
 gitlink:git-clone[1]::
        Clones a repository into a new directory.
 
@@ -319,6 +325,9 @@ gitlink:git-resolve[1]::
 gitlink:git-revert[1]::
        Revert an existing commit.
 
+gitlink:git-rm[1]::
+       Remove files from the working tree and from the index.
+
 gitlink:git-shortlog[1]::
        Summarizes 'git log' output.
 
@@ -357,6 +366,9 @@ gitlink:git-cvsimport[1]::
 gitlink:git-cvsexportcommit[1]::
        Export a single commit to a CVS checkout.
 
+gitlink:git-cvsserver[1]::
+       A CVS server emulator for git.
+
 gitlink:git-lost-found[1]::
        Recover lost refs that luckily have not yet been pruned.
 
@@ -399,9 +411,15 @@ gitlink:git-count-objects[1]::
 gitlink:git-daemon[1]::
        A really simple server for git repositories.
 
+gitlink:git-fmt-merge-msg[1]::
+       Produce a merge commit message.
+
 gitlink:git-get-tar-commit-id[1]::
        Extract commit ID from an archive created using git-tar-tree.
 
+gitlink:git-imap-send[1]::
+       Dump a mailbox from stdin into an imap folder.
+
 gitlink:git-mailinfo[1]::
        Extracts patch and authorship information from a single
        e-mail message, optionally transliterating the commit
@@ -411,6 +429,9 @@ gitlink:git-mailsplit[1]::
        A stupid program to split UNIX mbox format mailbox into
        individual pieces of e-mail.
 
+gitlink:git-merge-tree[1]::
+       Show three-way merge without touching index.
+
 gitlink:git-patch-id[1]::
        Compute unique ID for a patch.