Skip to content

Commit 8df4c5d

Browse files
pks-tgitster
authored andcommitted
Documentation: add "special refs" to the glossary
Add the "special refs" term to our glossary. Signed-off-by: Patrick Steinhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2cd33f4 commit 8df4c5d

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

Documentation/glossary-content.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,20 @@ The most notable example is `HEAD`.
638638
An <<def_object,object>> used to temporarily store the contents of a
639639
<<def_dirty,dirty>> working directory and the index for future reuse.
640640

641+
[[def_special_ref]]special ref::
642+
A ref that has different semantics than normal refs. These refs can be
643+
accessed via normal Git commands but may not behave the same as a
644+
normal ref in some cases.
645+
+
646+
The following special refs are known to Git:
647+
648+
- "`FETCH_HEAD`" is written by linkgit:git-fetch[1] or linkgit:git-pull[1]. It
649+
may refer to multiple object IDs. Each object ID is annotated with metadata
650+
indicating where it was fetched from and its fetch status.
651+
652+
- "`MERGE_HEAD`" is written by linkgit:git-merge[1] when resolving merge
653+
conflicts. It contains all commit IDs which are being merged.
654+
641655
[[def_submodule]]submodule::
642656
A <<def_repository,repository>> that holds the history of a
643657
separate project inside another repository (the latter of

0 commit comments

Comments
 (0)