diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-28 01:52:26 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-28 01:52:26 +0300 |
| commit | f96fecc7c4066519dc028436d875685791646f74 (patch) | |
| tree | 366f3a6f476416c6d5d10e4f79ec6c160bf781fb /Documentation/git.txt | |
| parent | b0d277d69f0afdf1053bde614ea2db504d9bca1e (diff) | |
| parent | bc62d27d5c2379505436cb8968c153c8b3a25d39 (diff) | |
Merge branch 'jc/doc-most-refs-are-not-that-special'
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.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 4698d7a42b..bf9e6af695 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -1025,10 +1025,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 |