diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-01-19 11:40:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-19 11:10:42 -0800 |
| commit | 8df4c5d205263c98378f0eea2b4ebab5e5c174aa (patch) | |
| tree | c89ff235267a376c1fd555fffca6635bbb0fb87f /Documentation/glossary-content.txt | |
| parent | 2cd33f44282853d77bea9c29d1a4f88d8c3b3e5a (diff) | |
| download | git-8df4c5d205263c98378f0eea2b4ebab5e5c174aa.tar.gz | |
Documentation: add "special refs" to the glossary
Add the "special refs" term to our glossary.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/glossary-content.txt')
| -rw-r--r-- | Documentation/glossary-content.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index f7d98c11e3..d71b199955 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -638,6 +638,20 @@ The most notable example is `HEAD`. An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse. +[[def_special_ref]]special ref:: + 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. ++ +The following special refs are known to Git: + + - "`FETCH_HEAD`" is written by linkgit:git-fetch[1] or linkgit:git-pull[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. + + - "`MERGE_HEAD`" is written by linkgit:git-merge[1] when resolving merge + conflicts. It contains all commit IDs which are being merged. + [[def_submodule]]submodule:: A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of |