Skip to content

Commit d8ddb0a

Browse files
dschoJunio C Hamano
authored andcommitted
[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>
1 parent 23e8673 commit d8ddb0a

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

Documentation/glossary.txt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,20 @@ blob object::
2727

2828
tree object::
2929
An object containing a list of file names and modes along with refs
30-
to the associated blob and/or tree objects. A tree object is
31-
equivalent to a directory.
30+
to the associated blob and/or tree objects. A tree is equivalent
31+
to a directory.
3232

3333
tree::
3434
Either a working tree, or a tree object together with the
3535
dependent blob and tree objects (i.e. a stored representation
3636
of a working tree).
3737

38+
DAG::
39+
Directed acyclic graph. The commit objects form a directed acyclic
40+
graph, because they have parents (directed), and the graph of commit
41+
objects is acyclic (there is no chain which begins and ends with the
42+
same object).
43+
3844
index::
3945
A collection of files with stat information, whose contents are
4046
stored as objects. The cache is a stored version of your working
@@ -142,6 +148,10 @@ merge::
142148
merge uses heuristics to accomplish that. Evidently, an automatic
143149
merge can fail.
144150

151+
octopus::
152+
To merge more than two branches. Also denotes an intelligent
153+
predator.
154+
145155
resolve::
146156
The action of fixing up manually what a failed automatic merge
147157
left behind.

0 commit comments

Comments
 (0)