X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fglossary.txt;h=14449ca8baeb7c2c979d0fd3f61ce683fd8e08ce;hb=4f12d529abbf233e1df93e7ffa5f2719005a2258;hp=39c90ad7a67cbceb83c41ee8dfe91d7b870e9e7a;hpb=baee9207b9aa6400a9b7cb9e7278e11b054fb640;p=git.git

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 39c90ad7a..14449ca8b 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -86,7 +86,7 @@ directory::
 ent::
 	Favorite synonym to "tree-ish" by some total geeks. See
 	`http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth
-	explanation.
+	explanation.  Avoid this term, not to confuse people.
 
 fast forward::
 	A fast-forward is a special type of merge where you have
@@ -109,6 +109,13 @@ file system::
 git archive::
 	Synonym for repository (for arch people).
 
+grafts::
+	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 commit
+	has is different from what was recorded when the commit was created.
+	Configured via the `.git/info/grafts` file.
+
 hash::
 	In git's context, synonym to object name.