diff options
| author | Lea Wiemann <lewiemann@gmail.com> | 2008-06-01 20:15:33 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-01 22:26:37 -0700 |
| commit | 850d3a7c05b4678af21b126ad30bc60510745ef1 (patch) | |
| tree | 5ba82056a5fbfee18fbfab2f5bd22c79b2979268 /Documentation/glossary-content.txt | |
| parent | 497c83314c1a595ef26dd4ea452022b0848d3219 (diff) | |
| download | git-850d3a7c05b4678af21b126ad30bc60510745ef1.tar.gz git-850d3a7c05b4678af21b126ad30bc60510745ef1.tar.xz | |
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>
Diffstat (limited to 'Documentation/glossary-content.txt')
| -rw-r--r-- | Documentation/glossary-content.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index f981fee4e..9b4a4f45e 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -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 |