Autogenerated HTML docs for v1.4.0-rc1-gfd7e

[git.git] / glossary.html

diff --git a/glossary.html b/glossary.html
index 0c45a4f..303893e 100644 (file)
--- a/glossary.html
+++ b/glossary.html
@@ -497,6 +497,18 @@ div.exampleblock-content {
 </p>\r
 </dd>\r
 <dt>\r
+<a id="ref_grafts"></a>grafts\r
+</dt>\r
+<dd>\r
+<p>\r
+        Grafts enables two otherwise different lines of development to be joined\r
+        together by recording fake ancestry information for commits. This way\r
+        you can make git pretend the set of parents a <a href="#ref_commit">commit</a> has\r
+        is different from what was recorded when the <a href="#ref_commit">commit</a> was\r
+        created. Configured via the <tt>.git/info/<a href="#ref_grafts">grafts</a></tt> file.\r
+</p>\r
+</dd>\r
+<dt>\r
 <a id="ref_hash"></a>hash\r
 </dt>\r
 <dd>\r
@@ -938,7 +950,7 @@ the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-May-2006 08:01:37 UTC\r
+Last updated 07-Jun-2006 19:51:37 UTC\r
 </div>\r
 </div>\r
 </body>\r