aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-02-08 16:22:08 -0800
committerJunio C Hamano <gitster@pobox.com>2024-02-08 16:22:08 -0800
commit79f79e58a4242ea2b492734a0c4984ded58907cc (patch)
treeb0801a94757073e902a50b6cc32ac380fefb2bd8 /Documentation/git.txt
parent7b95c644083e892df9c687b1ef4c4be01c55a18f (diff)
parentbc62d27d5c2379505436cb8968c153c8b3a25d39 (diff)
downloadgit-79f79e58a4242ea2b492734a0c4984ded58907cc.tar.xz
Merge branch 'jc/doc-most-refs-are-not-that-special' into maint-2.43
Doc updates. * jc/doc-most-refs-are-not-that-special: docs: MERGE_AUTOSTASH is not that special docs: AUTO_MERGE is not that special refs.h: HEAD is not that special git-bisect.txt: BISECT_HEAD is not that special git.txt: HEAD is not that special
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index caa6cbee7e..962887f190 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -1024,10 +1024,11 @@ When first created, objects are stored in individual files, but for
efficiency may later be compressed together into "pack files".
Named pointers called refs mark interesting points in history. A ref
-may contain the SHA-1 name of an object or the name of another ref. Refs
-with names beginning `ref/head/` contain the SHA-1 name of the most
+may contain the SHA-1 name of an object or the name of another ref (the
+latter is called a "symbolic ref").
+Refs with names beginning `refs/head/` contain the SHA-1 name of the most
recent commit (or "head") of a branch under development. SHA-1 names of
-tags of interest are stored under `ref/tags/`. A special ref named
+tags of interest are stored under `refs/tags/`. A symbolic ref named
`HEAD` contains the name of the currently checked-out branch.
The index file is initialized with a list of all paths and, for each