From: Johannes Schindelin Date: Thu, 25 Aug 2005 14:24:13 +0000 (+0200) Subject: [PATCH] More missing terms in glossary.txt X-Git-Tag: v0.99.6~90 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d8ddb0a41610fffdf9ef1a256d19d5a27face9d7;p=git.git [PATCH] More missing terms in glossary.txt Describe a DAG and octopus, and change wording of tree object. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index 7456cffd3..a069b7bb0 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.