summaryrefslogtreecommitdiff
path: root/Documentation/glossary.txt
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2005-08-25 14:24:13 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-26 18:11:48 (GMT)
commitd8ddb0a41610fffdf9ef1a256d19d5a27face9d7 (patch)
treec3b48136b2a17610d4ed1584a6e4f3ae0b694080 /Documentation/glossary.txt
parent23e8673093ff78c32d2e6aa271987d489e2f4c76 (diff)
downloadgit-d8ddb0a41610fffdf9ef1a256d19d5a27face9d7.zip
git-d8ddb0a41610fffdf9ef1a256d19d5a27face9d7.tar.gz
git-d8ddb0a41610fffdf9ef1a256d19d5a27face9d7.tar.bz2
[PATCH] More missing terms in glossary.txt
Describe a DAG and octopus, and change wording of tree object. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/glossary.txt')
-rw-r--r--Documentation/glossary.txt14
1 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 7456cff..a069b7b 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.