diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-08-26 17:34:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-26 17:34:01 -0700 |
| commit | b033b4e48195ef5974b7255f30de2cd7f67868b8 (patch) | |
| tree | eaa065e30f98110a82dec5992a45d1e4b0871fdf /Documentation/glossary.txt | |
| parent | Prepare 0.99.6 branch. (diff) | |
| parent | [PATCH] git bugfixes and cleanups, mainly Debian things (diff) | |
| download | tgif-b033b4e48195ef5974b7255f30de2cd7f67868b8.tar.xz | |
Merge refs/heads/master from .
Diffstat (limited to 'Documentation/glossary.txt')
| -rw-r--r-- | Documentation/glossary.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index 7456cffd33..a069b7bb0c 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. |