X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fglossary.txt;h=894883d7b60c4c79263323fc007406c4f3720bac;hb=cc06c870685865decc7948cdb2d7e9b52ac8ee32;hp=39c90ad7a67cbceb83c41ee8dfe91d7b870e9e7a;hpb=4ca72f20c382134b85f22fca83472572e5542f4f;p=git.git

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 39c90ad7a..894883d7b 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -86,7 +86,7 @@ directory::
 ent::
 	Favorite synonym to "tree-ish" by some total geeks. See
 	`http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth
-	explanation.
+	explanation.  Avoid this term, not to confuse people.
 
 fast forward::
 	A fast-forward is a special type of merge where you have
@@ -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.
 
@@ -172,7 +179,7 @@ object name::
 	character hexadecimal encoding of the hash of the object (possibly
 	followed by a white space).
 
-object type:
+object type::
 	One of the identifiers "commit","tree","tag" and "blob" describing
 	the type of an object.
 
@@ -275,6 +282,13 @@ SCM::
 SHA1::
 	Synonym for object name.
 
+symref::
+	Symbolic reference: instead of containing the SHA1 id itself, it
+	is of the format 'ref: refs/some/thing' and when referenced, it
+	recursively dereferences to this reference. 'HEAD' is a prime
+	example of a symref. Symbolic references are manipulated with
+	the gitlink:git-symbolic-ref[1] command.
+
 topic branch::
 	A regular git branch that is used by a developer to
 	identify a conceptual line of development.  Since branches
@@ -317,7 +331,7 @@ tag::
 	A tag is most typically used to mark a particular point in the
 	commit ancestry chain.
 
-unmerged index:
+unmerged index::
 	An index which contains unmerged index entries.
 
 working tree::