Update diff-options and config documentation.

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 39c90ad7a67cbceb83c41ee8dfe91d7b870e9e7a..116ddb7fbfd7654bb7330e8f56dd03a9be029cd1 100644 (file)
--- 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.