projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GIT 0.99.9c
[git.git]
/
Documentation
/
glossary.txt
diff --git
a/Documentation/glossary.txt
b/Documentation/glossary.txt
index
7456cff
..
eb7b471
100644
(file)
--- a/
Documentation/glossary.txt
+++ b/
Documentation/glossary.txt
@@
-1,5
+1,5
@@
object::
object::
- The unit of storage in
GIT
. It is uniquely identified by
+ The unit of storage in
git
. It is uniquely identified by
the SHA1 of its contents. Consequently, an object can not
be changed.
the SHA1 of its contents. Consequently, an object can not
be changed.
@@
-27,14
+27,20
@@
blob object::
tree object::
An object containing a list of file names and modes along with refs
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).
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
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.
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.
resolve::
The action of fixing up manually what a failed automatic merge
left behind.