summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Yasushi SHOJI <yashi@atmark-techno.com>2007-03-05 03:07:43 +0900
committerLibravatar Junio C Hamano <junkio@cox.net>2007-03-04 16:47:33 -0800
commit2aa54fa872adf37fb3e062dbcafefa30506eed49 (patch)
treed6f026584d6cb9f67862686f1cb3f604a74ccb88 /Documentation
parentuser-manual: more detailed merge discussion (diff)
downloadtgif-2aa54fa872adf37fb3e062dbcafefa30506eed49.tar.xz
glossary: Add definitions for dangling and unreachable objects
Define "dangling" and "unreachable" objects. Modified from original text proposed by Yasushi Shoji. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/glossary.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index d20eb6270c..9f446241e2 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -73,6 +73,11 @@ DAG::
objects is acyclic (there is no chain which begins and ends with the
same object).
+dangling object::
+ An unreachable object which is not reachable even from other
+ unreachable objects; a dangling object has no references to it
+ from any reference or object in the repository.
+
dircache::
You are *waaaaay* behind.
@@ -350,6 +355,10 @@ tag::
unmerged index::
An index which contains unmerged index entries.
+unreachable object::
+ An object which is not reachable from a branch, tag, or any
+ other reference.
+
working tree::
The set of files and directories currently being worked on,
i.e. you can work in your working tree without using git at all.