undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] More missing terms in glossary.txt

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2005-08-25 16:24:13 +02:00 committed by Junio C Hamano
parent 23e8673093
commit d8ddb0a416
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/glossary.txt
View File

@ -27,14 +27,20 @@ blob object::
tree object:: tree object::
An object containing a list of file names and modes along with refs 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 to the associated blob and/or tree objects. A tree is equivalent
equivalent to a directory. to a directory.
tree:: tree::
Either a working tree, or a tree object together with the Either a working tree, or a tree object together with the
dependent blob and tree objects (i.e. a stored representation dependent blob and tree objects (i.e. a stored representation
of a working tree). 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:: index::
A collection of files with stat information, whose contents are A collection of files with stat information, whose contents are
stored as objects. The cache is a stored version of your working 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 uses heuristics to accomplish that. Evidently, an automatic
merge can fail. merge can fail.
octopus::
To merge more than two branches. Also denotes an intelligent
predator.
resolve:: resolve::
The action of fixing up manually what a failed automatic merge The action of fixing up manually what a failed automatic merge
left behind. left behind.