Commit 850d3a7c authored by Lea Wiemann's avatar Lea Wiemann Committed by Junio C Hamano

glossary: improve a few links

They now point to more specific/appropriate targets.
Signed-off-by: default avatarLea Wiemann <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 497c8331
......@@ -87,11 +87,10 @@ to point at the new commit.
source code management tools.
[[def_DAG]]DAG::
Directed acyclic graph. The <<def_commit,commit>> objects form a
Directed acyclic graph. The <<def_commit_object,commit objects>> form a
directed acyclic graph, because they have parents (directed), and the
graph of commit objects is acyclic (there is no
<<def_chain,chain>> which begins and ends with the same
<<def_object,object>>).
graph of commit objects is acyclic (there is no <<def_chain,chain>>
which begins and ends with the same <<def_object,object>>).
[[def_dangling_object]]dangling object::
An <<def_unreachable_object,unreachable object>> which is not
......@@ -247,9 +246,10 @@ This commit is referred to as a "merge commit", or sometimes just a
the <<def_hash,hash>> of the object.
[[def_object_type]]object type::
One of the identifiers
"<<def_commit,commit>>","<<def_tree,tree>>","<<def_tag,tag>>" or "<<def_blob_object,blob>>"
describing the type of an <<def_object,object>>.
One of the identifiers "<<def_commit_object,commit>>",
"<<def_tree_object,tree>>", "<<def_tag_object,tag>>" or
"<<def_blob_object,blob>>" describing the type of an
<<def_object,object>>.
[[def_octopus]]octopus::
To <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment