@@ -153,7 +153,7 @@ to point at the new commit.
153
153
created. Configured via the `.git/info/grafts` file.
154
154
155
155
[[def_hash]]hash::
156
- In Git's context, synonym to <<def_object_name,object name>>.
156
+ In Git's context, synonym for <<def_object_name,object name>>.
157
157
158
158
[[def_head]]head::
159
159
A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a
@@ -225,7 +225,7 @@ This commit is referred to as a "merge commit", or sometimes just a
225
225
226
226
[[def_object]]object::
227
227
The unit of storage in Git. It is uniquely identified by the
228
- <<def_SHA1,SHA1 >> of its contents. Consequently, an
228
+ <<def_SHA1,SHA-1 >> of its contents. Consequently, an
229
229
object can not be changed.
230
230
231
231
[[def_object_database]]object database::
@@ -237,10 +237,9 @@ This commit is referred to as a "merge commit", or sometimes just a
237
237
Synonym for <<def_object_name,object name>>.
238
238
239
239
[[def_object_name]]object name::
240
- The unique identifier of an <<def_object,object>>. The <<def_hash,hash>>
241
- of the object's contents using the Secure Hash Algorithm
242
- 1 and usually represented by the 40 character hexadecimal encoding of
243
- the <<def_hash,hash>> of the object.
240
+ The unique identifier of an <<def_object,object>>. The
241
+ object name is usually represented by a 40 character
242
+ hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>.
244
243
245
244
[[def_object_type]]object type::
246
245
One of the identifiers "<<def_commit_object,commit>>",
@@ -376,7 +375,7 @@ should not be combined with other pathspec.
376
375
to the result.
377
376
378
377
[[def_ref]]ref::
379
- A 40-byte hex representation of a <<def_SHA1,SHA1 >> or a name that
378
+ A 40-byte hex representation of a <<def_SHA1,SHA-1 >> or a name that
380
379
denotes a particular <<def_object,object>>. They may be stored in
381
380
a file under `$GIT_DIR/refs/` directory, or
382
381
in the `$GIT_DIR/packed-refs` file.
@@ -432,8 +431,9 @@ should not be combined with other pathspec.
432
431
[[def_SCM]]SCM::
433
432
Source code management (tool).
434
433
435
- [[def_SHA1]]SHA1::
436
- Synonym for <<def_object_name,object name>>.
434
+ [[def_SHA1]]SHA-1::
435
+ "Secure Hash Algorithm 1"; a cryptographic hash function.
436
+ In the context of Git used as a synonym for <<def_object_name,object name>>.
437
437
438
438
[[def_shallow_repository]]shallow repository::
439
439
A shallow <<def_repository,repository>> has an incomplete
@@ -447,7 +447,7 @@ should not be combined with other pathspec.
447
447
its history can be later deepened with linkgit:git-fetch[1].
448
448
449
449
[[def_symref]]symref::
450
- Symbolic reference: instead of containing the <<def_SHA1,SHA1 >>
450
+ Symbolic reference: instead of containing the <<def_SHA1,SHA-1 >>
451
451
id itself, it is of the format 'ref: refs/some/thing' and when
452
452
referenced, it recursively dereferences to this reference.
453
453
'<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic
0 commit comments