X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fglossary.txt;h=a069b7bb0cfbdacfc0ac2dd2183981b806792805;hb=b23f02ee7aa3fc1cdaf6aebde9b731f22671251b;hp=7456cffd3306f83ce466a5a4afbdadc4fe980fb1;hpb=b30245c8e92ecaf8fb877189d7620a5a9a205120;p=git.git

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 7456cffd..a069b7bb 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -27,14 +27,20 @@ blob object::
 
 tree object::
 	An object containing a list of file names and modes along with refs
-	to the associated blob and/or tree objects. A tree object is
-	equivalent to a directory.
+	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
@@ -142,6 +148,10 @@ 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.