X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fglossary.txt;h=116ddb7fbfd7654bb7330e8f56dd03a9be029cd1;hb=74237d6236d7e32f69469ff26df3f3bb3875f523;hp=39c90ad7a67cbceb83c41ee8dfe91d7b870e9e7a;hpb=230f544e877641666f8c3718ac4563294c2b305e;p=git.git

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 39c90ad7..116ddb7f 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -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.