diff options
Diffstat (limited to 'man7/gitglossary.7')
-rw-r--r-- | man7/gitglossary.7 | 46 |
1 files changed, 40 insertions, 6 deletions
diff --git a/man7/gitglossary.7 b/man7/gitglossary.7 index 2988c8db4..b4381c2ce 100644 --- a/man7/gitglossary.7 +++ b/man7/gitglossary.7 @@ -2,12 +2,12 @@ .\" Title: gitglossary .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-11-14 +.\" Date: 2023-11-20 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc2 +.\" Source: Git 2.43.0 .\" Language: English .\" -.TH "GITGLOSSARY" "7" "2023\-11\-14" "Git 2\&.43\&.0\&.rc2" "Git Manual" +.TH "GITGLOSSARY" "7" "2023\-11\-20" "Git 2\&.43\&.0" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -187,7 +187,9 @@ A commit object or an object -that can be recursively dereferenced to a commit object\&. The following are all commit\-ishes: a commit object, a +that can be recursively +dereferenced +to a commit object\&. The following are all commit\-ishes: a commit object, a tag object that points to a commit object, a tag object that points to a tag object that points to a commit object, etc\&. .RE @@ -219,6 +221,26 @@ in the repository\&. .RE .PP +dereference +.RS 4 +Referring to a +symbolic ref: the action of accessing the +reference +pointed at by a symbolic ref\&. Recursive dereferencing involves repeating the aforementioned process on the resulting ref until a non\-symbolic reference is found\&. +.sp +Referring to a +tag object: the action of accessing the +object +a tag points at\&. Tags are recursively dereferenced by repeating the operation on the result object until the result has either a specified +object type +(where applicable) or any non\-"tag" object type\&. A synonym for "recursive dereference" in the context of tags is "peel"\&. +.sp +Referring to a +commit object: the action of accessing the commit\(cqs tree object\&. Commits cannot be dereferenced recursively\&. +.sp +Unless otherwise specified, "dereferencing" as it used in the context of Git commands or protocols is implicitly recursive\&. +.RE +.PP detached HEAD .RS 4 Normally the @@ -707,6 +729,14 @@ commit object contains a (possibly empty) list of the logical predecessor(s) in the line of development, i\&.e\&. its parents\&. .RE .PP +peel +.RS 4 +The action of recursively +dereferencing +a +tag object\&. +.RE +.PP pickaxe .RS 4 The term @@ -990,7 +1020,9 @@ Symbolic reference: instead of containing the SHA\-1 id itself, it is of the format \fIref: refs/some/thing\fR -and when referenced, it recursively dereferences to this reference\&. +and when referenced, it recursively +dereferences +to this reference\&. \fIHEAD\fR is a prime example of a symref\&. Symbolic references are manipulated with the \fBgit-symbolic-ref\fR(1) @@ -1058,7 +1090,9 @@ A tree object or an object -that can be recursively dereferenced to a tree object\&. Dereferencing a +that can be recursively +dereferenced +to a tree object\&. Dereferencing a commit object yields the tree object corresponding to the revision\*(Aqs top |