summaryrefslogtreecommitdiffstats
path: root/gitglossary.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-11-11 23:59:36 -0800
committerJunio C Hamano <gitster@pobox.com>2022-11-11 23:59:36 -0800
commite8c74d8c0e412fe8989ee1dc8df321c53dbd8a3b (patch)
tree5a01546b14d129911330dc3b09eb13e85f2b98ef /gitglossary.html
parent979463309733bb608fee0d57c0ba03bdca004d03 (diff)
downloadgit-htmldocs-e8c74d8c0e412fe8989ee1dc8df321c53dbd8a3b.tar.gz
Autogenerated HTML docs for v2.38.1-420-g31960
Diffstat (limited to 'gitglossary.html')
-rw-r--r--gitglossary.html42
1 files changed, 40 insertions, 2 deletions
diff --git a/gitglossary.html b/gitglossary.html
index 1369a7461..6d0632f87 100644
--- a/gitglossary.html
+++ b/gitglossary.html
@@ -796,7 +796,7 @@ gitglossary(7) Manual Page
<p>
A "branch" is a line of development. The most recent
<a href="#def_commit">commit</a> on a branch is referred to as the tip of
- that branch. The tip of the branch is referenced by a branch
+ that branch. The tip of the branch is <a href="#def_ref">referenced</a> by a branch
<a href="#def_head">head</a>, which moves forward as additional development
is done on the branch. A single Git
<a href="#def_repository">repository</a> can track an arbitrary number of
@@ -887,6 +887,31 @@ state of the <a href="#def_index">index</a> and advancing <a href="#def_HEAD">HE
to point at the new commit.</p></div>
</dd>
<dt class="hdlist1">
+<a id="def_commit_graph_general"></a>commit graph concept, representations and usage
+</dt>
+<dd>
+<p>
+ A synonym for the <a href="#def_DAG">DAG</a> structure formed by the commits
+ in the object database, <a href="#def_ref">referenced</a> by branch tips,
+ using their <a href="#def_chain">chain</a> of linked commits.
+ This structure is the definitive commit graph. The
+ graph can be represented in other ways, e.g. the
+ <a href="#def_commit_graph_file">"commit-graph" file</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+<a id="def_commit_graph_file"></a>commit-graph file
+</dt>
+<dd>
+<p>
+ The "commit-graph" (normally hyphenated) file is a supplemental
+ representation of the <a href="#def_commit_graph_general">commit graph</a>
+ which accelerates commit graph walks. The "commit-graph" file is
+ stored either in the .git/objects/info directory or in the info
+ directory of an alternate object database.
+</p>
+</dd>
+<dt class="hdlist1">
<a id="def_commit_object"></a>commit object
</dt>
<dd>
@@ -1200,7 +1225,7 @@ This commit is referred to as a "merge commit", or sometimes just a
</p>
</dd>
<dt class="hdlist1">
-<a id="def_object_identifier"></a>object identifier
+<a id="def_object_identifier"></a>object identifier (oid)
</dt>
<dd>
<p>
@@ -1585,6 +1610,19 @@ exclude
</p>
</dd>
<dt class="hdlist1">
+<a id="def_reachability_bitmap"></a>reachability bitmaps
+</dt>
+<dd>
+<p>
+ Reachability bitmaps store information about the
+ <a href="#def_reachable">reachability</a> of a selected set of commits in
+ a packfile, or a multi-pack index (MIDX), to speed up object search.
+ The bitmaps are stored in a ".bitmap" file. A repository may have at
+ most one bitmap file in use. The bitmap file may belong to either one
+ pack, or the repository&#8217;s multi-pack index (if it exists).
+</p>
+</dd>
+<dt class="hdlist1">
<a id="def_rebase"></a>rebase
</dt>
<dd>