Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
glossary: improve a few links
author
Lea Wiemann
<lewiemann@gmail.com>
Sun, 1 Jun 2008 18:15:33 +0000
(20:15 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 2 Jun 2008 05:26:37 +0000
(22:26 -0700)
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>
Documentation/glossary-content.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
497c833
)
diff --git
a/Documentation/glossary-content.txt
b/Documentation/glossary-content.txt
index f981fee4e541324049976dafd6a42955d0eca75d..9b4a4f45e900a96c4ddeb214816877f39cca15a5 100644
(file)
--- 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::
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
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
[[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::
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
[[def_octopus]]octopus::
To <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an