diff options
Diffstat (limited to 'man7/gitglossary.7')
| -rw-r--r-- | man7/gitglossary.7 | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/man7/gitglossary.7 b/man7/gitglossary.7 index c7d4741c4..6f4d43c0d 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: 2024-01-26 +.\" Date: 2024-01-29 .\" Manual: Git Manual -.\" Source: Git 2.43.0.440.gb50a608ba2 +.\" Source: Git 2.43.0.473.gc5b454771e .\" Language: English .\" -.TH "GITGLOSSARY" "7" "2024\-01\-26" "Git 2\&.43\&.0\&.440\&.gb50a60" "Git Manual" +.TH "GITGLOSSARY" "7" "2024\-01\-29" "Git 2\&.43\&.0\&.473\&.gc5b454" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1011,6 +1011,40 @@ dirty working directory and the index for future reuse\&. .RE .PP +special ref +.RS 4 +A ref that has different semantics than normal refs\&. These refs can be accessed via normal Git commands but may not behave the same as a normal ref in some cases\&. +.sp +The following special refs are known to Git: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +"\fBFETCH_HEAD\fR" is written by +\fBgit-fetch\fR(1) +or +\fBgit-pull\fR(1)\&. It may refer to multiple object IDs\&. Each object ID is annotated with metadata indicating where it was fetched from and its fetch status\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +"\fBMERGE_HEAD\fR" is written by +\fBgit-merge\fR(1) +when resolving merge conflicts\&. It contains all commit IDs which are being merged\&. +.RE +.RE +.PP submodule .RS 4 A |