X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=glossary.html;h=303893e0e78485ff3260ff4ada75787401e774ea;hp=0c45a4f7393a1dc8d194990de230bf5750db3264;hb=33db43733d19e4dd878a9a04089535eaf47fd374;hpb=1bab4b0c25397665461ac79c23871ba23e83cf9f

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