Skip to content

Commit cea431c

Browse files
committed
Merge branch 'po/glossary-around-traversal' into seen
The glossary entries for "commit-graph file" and "reachability bitmap" have been added. * po/glossary-around-traversal: glossary: add reachability bitmap description glossary: add commit graph description glossary: add Object DataBase (ODB) abbreviation
2 parents 4b4be55 + 564de4c commit cea431c

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

Documentation/glossary-content.txt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,13 @@ state in the Git history, by creating a new commit representing the current
7575
state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>>
7676
to point at the new commit.
7777

78+
[[def_commit_graph]]commit graph::
79+
The commit-graph file is a supplemental data structure that
80+
accelerates commit graph walks. The existing Object Data Base (ODB)
81+
is the definitive commit graph. The "commit-graph" file is stored
82+
either in the .git/objects/info directory or in the info directory
83+
of an alternate object database.
84+
7885
[[def_commit_object]]commit object::
7986
An <<def_object,object>> which contains the information about a
8087
particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer,
@@ -257,7 +264,7 @@ This commit is referred to as a "merge commit", or sometimes just a
257264
<<def_SHA1,SHA-1>> of its contents. Consequently, an
258265
object cannot be changed.
259266

260-
[[def_object_database]]object database::
267+
[[def_object_database]]object database (ODB)::
261268
Stores a set of "objects", and an individual <<def_object,object>> is
262269
identified by its <<def_object_name,object name>>. The objects usually
263270
live in `$GIT_DIR/objects/`.
@@ -493,6 +500,12 @@ exclude;;
493500
<<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>>
494501
that they contain.
495502

503+
[[def_reachability_bitmap]]reachability bitmaps::
504+
Reachability bitmaps store information about the set of objects in
505+
a packfile, or a multi-pack index (MIDX). A repository may have at
506+
most one bitmap. The bitmap may belong to either one pack, or the
507+
repository's multi-pack index (if it exists).
508+
496509
[[def_rebase]]rebase::
497510
To reapply a series of changes from a <<def_branch,branch>> to a
498511
different base, and reset the <<def_head,head>> of that branch

0 commit comments

Comments
 (0)