From: Thomas Ackermann Date: Tue, 02 Apr 2013 09:27:46 GMT Subject: [PATCH 2/3] Improve description of SHA1 related topics in glossary-content.txt Message-ID: <638015718.727691.1364894866964.JavaMail.ngmail@webmail14.arcor-online.net> In-Reply-To: <1481339149.727628.1364894663266.JavaMail.ngmail@webmail14.arcor-online.net> Signed-off-by: Thomas Ackermann --- Documentation/glossary-content.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index ab02238..05bfebc 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -146,7 +146,7 @@ to point at the new commit. created. Configured via the `.git/info/grafts` file. [[def_hash]]hash:: - In Git's context, synonym to <>. + In Git's context, synonym for <>. [[def_head]]head:: A <> to the <> at the tip of a @@ -230,10 +230,9 @@ This commit is referred to as a "merge commit", or sometimes just a Synonym for <>. [[def_object_name]]object name:: - The unique identifier of an <>. The <> - of the object's contents using the Secure Hash Algorithm - 1 and usually represented by the 40 character hexadecimal encoding of - the <> of the object. + The unique identifier of an <>: The <> hash + of the object's contents. The object name is usually represented by the + 40 character hexadecimal encoding of the hash value. [[def_object_type]]object type:: One of the identifiers "<>", @@ -426,7 +425,8 @@ should not be combined with other pathspec. Source code management (tool). [[def_SHA1]]SHA1:: - Synonym for <>. + "Secure Hash Algorithm 1"; a cryptographic hash function. + In the context of Git used as a synonym for <>. [[def_shallow_repository]]shallow repository:: A shallow <> has an incomplete -- 1.8.1.msysgit.1 --- Thomas