X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fglossary.txt;h=a069b7bb0cfbdacfc0ac2dd2183981b806792805;hb=3459c2c433ac46eac596810d2ef2c3d4ef949852;hp=015d51018dd26642f8251d59c132d8bfc772e37e;hpb=9d34c29db39bdb5c2443475dd6a24cfc5c2c9e37;p=git.git

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 015d5101..a069b7bb 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -26,15 +26,21 @@ blob object::
 	Untyped object, e.g. the contents of a file.
 
 tree object::
-	An object containing a list of blob and/or tree objects.
-	(A tree usually corresponds to a directory without
-	subdirectories).
+	An object containing a list of file names and modes along with refs
+	to the associated blob and/or tree objects. A tree is equivalent
+	to a directory.
 
 tree::
 	Either a working tree, or a tree object together with the
 	dependent blob and tree objects (i.e. a stored representation
 	of a working tree).
 
+DAG::
+	Directed acyclic graph. The commit objects form a directed acyclic
+	graph, because they have parents (directed), and the graph of commit
+	objects is acyclic (there is no chain which begins and ends with the
+	same object).
+
 index::
 	A collection of files with stat information, whose contents are
 	stored as objects. The cache is a stored version of your working
@@ -118,11 +124,14 @@ tree-ish::
 	tag object pointing to a tag or commit or tree object.
 
 ent::
-	Favorite synonym to "tree-ish" by some total geeks.
+	Favorite synonym to "tree-ish" by some total geeks. See
+	http://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth
+	explanation.
 
 tag object::
-	An object containing a ref pointing to another object. It can
-	contain a (PGP) signature, in which case it is called "signed
+	An object containing a ref pointing to another object, which can
+	contain a message just like a commit object. It can also
+	contain a (PGP) signature, in which case it is called a "signed
 	tag object".
 
 tag::
@@ -139,10 +148,23 @@ merge::
 	merge uses heuristics to accomplish that. Evidently, an automatic
 	merge can fail.
 
+octopus::
+	To merge more than two branches. Also denotes an intelligent
+	predator.
+
 resolve::
 	The action of fixing up manually what a failed automatic merge
 	left behind.
 
+rewind::
+	To throw away part of the development, i.e. to assign the head to
+	an earlier revision.
+
+rebase::
+	To clean a branch by starting from the head of the main line of
+	development ("master"), and reapply the (possibly cherry-picked)
+	changes from that branch.
+
 repository::
 	A collection of refs together with an object database containing
 	all objects, which are reachable from the refs, possibly accompanied
@@ -196,6 +218,10 @@ pack index::
 	The list of identifiers, and other information, of the objects in a
 	pack, to assist in efficiently accessing the contents of a pack. 
 
+core git::
+	Fundamental data structures and utilities of git. Exposes only
+	limited source code management tools.
+
 plumbing::
 	Cute name for core git.