{"thread":{"id":"1644","subject":"Subject: [PATCH] More missing terms in glossary.txt","startedAt":"2005-08-25T14:24:13Z","lastAt":"2005-08-25T14:24:13Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"7746","messageId":"Pine.LNX.4.63.0508251622360.6088@wgmdd8.biozentrum.uni-wuerzburg.de","threadId":"1644","inReplyTo":null,"subject":"Subject: [PATCH] More missing terms in glossary.txt","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-08-25T14:24:13Z","receivedAt":"2005-08-25T14:24:13Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Describe a DAG and octopus, and change wording of tree object.\n\nSigned-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n\n---\n\n Documentation/glossary.txt |   14 ++++++++++++--\n 1 files changed, 12 insertions(+), 2 deletions(-)\n\ne077919262930f6ce494c963d23317eb2aaf0dd3\ndiff --git a/Documentation/glossary.txt b/Documentation/glossary.txt\n--- a/Documentation/glossary.txt\n+++ b/Documentation/glossary.txt\n@@ -27,14 +27,20 @@ blob object::\n \n tree object::\n \tAn object containing a list of file names and modes along with refs\n-\tto the associated blob and/or tree objects. A tree object is\n-\tequivalent to a directory.\n+\tto the associated blob and/or tree objects. A tree is equivalent\n+\tto a directory.\n \n tree::\n \tEither a working tree, or a tree object together with the\n \tdependent blob and tree objects (i.e. a stored representation\n \tof a working tree).\n \n+DAG::\n+\tDirected acyclic graph. The commit objects form a directed acyclic\n+\tgraph, because they have parents (directed), and the graph of commit\n+\tobjects is acyclic (there is no chain which begins and ends with the\n+\tsame object).\n+\n index::\n \tA collection of files with stat information, whose contents are\n \tstored as objects. The cache is a stored version of your working\n@@ -142,6 +148,10 @@ merge::\n \tmerge uses heuristics to accomplish that. Evidently, an automatic\n \tmerge can fail.\n \n+octopus::\n+\tTo merge more than two branches. Also denotes an intelligent\n+\tpredator.\n+\n resolve::\n \tThe action of fixing up manually what a failed automatic merge\n \tleft behind.\n"}]}