Browse Source

glossary: improve a few links

They now point to more specific/appropriate targets.

Signed-off-by: Lea Wiemann <LeWiemann@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Lea Wiemann 17 years ago committed by Junio C Hamano
parent
commit
850d3a7c05
  1. 14
      Documentation/glossary-content.txt

14
Documentation/glossary-content.txt

@ -87,11 +87,10 @@ to point at the new commit.
source code management tools. source code management tools.


[[def_DAG]]DAG:: [[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 directed acyclic graph, because they have parents (directed), and the
graph of commit objects is acyclic (there is no graph of commit objects is acyclic (there is no <<def_chain,chain>>
<<def_chain,chain>> which begins and ends with the same which begins and ends with the same <<def_object,object>>).
<<def_object,object>>).


[[def_dangling_object]]dangling object:: [[def_dangling_object]]dangling object::
An <<def_unreachable_object,unreachable object>> which is not 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. the <<def_hash,hash>> of the object.


[[def_object_type]]object type:: [[def_object_type]]object type::
One of the identifiers One of the identifiers "<<def_commit_object,commit>>",
"<<def_commit,commit>>","<<def_tree,tree>>","<<def_tag,tag>>" or "<<def_blob_object,blob>>" "<<def_tree_object,tree>>", "<<def_tag_object,tag>>" or
describing the type of an <<def_object,object>>. "<<def_blob_object,blob>>" describing the type of an
<<def_object,object>>.


[[def_octopus]]octopus:: [[def_octopus]]octopus::
To <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an To <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an

Loading…
Cancel
Save