summaryrefslogtreecommitdiff
path: root/Documentation/glossary.txt
diff options
context:
space:
mode:
authorJonas Fonseca <fonseca@diku.dk>2006-06-07 18:32:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-07 19:37:46 (GMT)
commit74237d6236d7e32f69469ff26df3f3bb3875f523 (patch)
treede5abe163180aa34f16406197ff8be5f26a068ba /Documentation/glossary.txt
parent34925d35ff278c7377e0cf3fce0227d5eceffeb5 (diff)
downloadgit-74237d6236d7e32f69469ff26df3f3bb3875f523.zip
git-74237d6236d7e32f69469ff26df3f3bb3875f523.tar.gz
git-74237d6236d7e32f69469ff26df3f3bb3875f523.tar.bz2
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.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 39c90ad..116ddb7 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.