X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fglossary.txt;h=7e560b0eea83ae7b32e17095f766d84c0b67671f;hb=7768e27e1d3f3d5e253e795433033b5de1d1c157;hp=14449ca8baeb7c2c979d0fd3f61ce683fd8e08ce;hpb=3939b805f4147a97c08cc50ef7e53cd6c2490c5c;p=git.git diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index 14449ca8b..7e560b0ee 100644 --- a/Documentation/glossary.txt +++ b/Documentation/glossary.txt @@ -179,7 +179,7 @@ object name:: character hexadecimal encoding of the hash of the object (possibly followed by a white space). -object type: +object type:: One of the identifiers "commit","tree","tag" and "blob" describing the type of an object. @@ -324,7 +324,7 @@ tag:: A tag is most typically used to mark a particular point in the commit ancestry chain. -unmerged index: +unmerged index:: An index which contains unmerged index entries. working tree::