diff options
Diffstat (limited to 'user-manual.html')
| -rw-r--r-- | user-manual.html | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/user-manual.html b/user-manual.html index f29318aad..47d7266cd 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1974,7 +1974,7 @@ itself!</p></div></div><div class="chapter"><div class="titlepage"><div><div><h1 </span></dt><dd> A "branch" is a line of development. The most recent <a class="link" 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 class="link" href="#def_ref">referenced</a> by a branch <a class="link" href="#def_head">head</a>, which moves forward as additional development is done on the branch. A single Git <a class="link" href="#def_repository">repository</a> can track an arbitrary number of @@ -2034,6 +2034,23 @@ itself!</p></div></div><div class="chapter"><div class="titlepage"><div><div><h1 state in the Git history, by creating a new commit representing the current state of the <a class="link" href="#def_index">index</a> and advancing <a class="link" href="#def_HEAD">HEAD</a> to point at the new commit.</p></dd><dt><span class="term"> +<a name="def_commit_graph_general"></a>commit graph concept, representations and usage +</span></dt><dd> + A synonym for the <a class="link" href="#def_DAG">DAG</a> structure formed by the commits + in the object database, <a class="link" href="#def_ref">referenced</a> by branch tips, + using their <a class="link" 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 class="link" href="#def_commit_graph_file">"commit-graph" file</a>. +</dd><dt><span class="term"> +<a name="def_commit_graph_file"></a>commit-graph file +</span></dt><dd> + The "commit-graph" (normally hyphenated) file is a supplemental + representation of the <a class="link" 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. +</dd><dt><span class="term"> <a name="def_commit_object"></a>commit object </span></dt><dd> An <a class="link" href="#def_object">object</a> which contains the information about a @@ -2240,7 +2257,7 @@ This commit is referred to as a "merge commit", or sometimes just a identified by its <a class="link" href="#def_object_name">object name</a>. The objects usually live in <code class="literal">$GIT_DIR/objects/</code>. </dd><dt><span class="term"> -<a name="def_object_identifier"></a>object identifier +<a name="def_object_identifier"></a>object identifier (oid) </span></dt><dd> Synonym for <a class="link" href="#def_object_name">object name</a>. </dd><dt><span class="term"> @@ -2473,6 +2490,15 @@ exclude <a class="link" href="#def_tree_object">trees</a> to the trees or <a class="link" href="#def_blob_object">blobs</a> that they contain. </dd><dt><span class="term"> +<a name="def_reachability_bitmap"></a>reachability bitmaps +</span></dt><dd> + Reachability bitmaps store information about the + <a class="link" 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’s multi-pack index (if it exists). +</dd><dt><span class="term"> <a name="def_rebase"></a>rebase </span></dt><dd> To reapply a series of changes from a <a class="link" href="#def_branch">branch</a> to a |