diff options
Diffstat (limited to 'Documentation/glossary.txt')
| -rw-r--r-- | Documentation/glossary.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index 39c90ad7a6..116ddb7fbf 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. |