diff options
| author | Jonas Fonseca <fonseca@diku.dk> | 2006-06-07 20:32:33 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-07 12:37:46 -0700 |
| commit | 74237d6236d7e32f69469ff26df3f3bb3875f523 (patch) | |
| tree | de5abe163180aa34f16406197ff8be5f26a068ba /Documentation/glossary.txt | |
| parent | 34925d35ff278c7377e0cf3fce0227d5eceffeb5 (diff) | |
| download | git-74237d6236d7e32f69469ff26df3f3bb3875f523.tar.gz git-74237d6236d7e32f69469ff26df3f3bb3875f523.tar.xz | |
Misc doc improvements
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 39c90ad7a..116ddb7fb 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. |