diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-29 16:03:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-29 16:03:00 -0800 |
| commit | 8282f9592838acd265491737e4d36636fc64b639 (patch) | |
| tree | 775238c960cfb528e2ba78001e676d76d8ba39b3 /path.c | |
| parent | 9869e02a645babb91be500ea11eabddc551850e2 (diff) | |
| parent | 8df4c5d205263c98378f0eea2b4ebab5e5c174aa (diff) | |
| download | git-8282f9592838acd265491737e4d36636fc64b639.tar.gz | |
Merge branch 'ps/not-so-many-refs-are-special'
Define "special ref" as a very narrow set that consists of
FETCH_HEAD and MERGE_HEAD, and clarify everything else that used to
be classified as such are actually just pseudorefs.
* ps/not-so-many-refs-are-special:
Documentation: add "special refs" to the glossary
refs: redefine special refs
refs: convert MERGE_AUTOSTASH to become a normal pseudo-ref
sequencer: introduce functions to handle autostashes via refs
refs: convert AUTO_MERGE to become a normal pseudo-ref
sequencer: delete REBASE_HEAD in correct repo when picking commits
sequencer: clean up pseudo refs with REF_NO_DEREF
Diffstat (limited to 'path.c')
| -rw-r--r-- | path.c | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -1588,7 +1588,5 @@ REPO_GIT_PATH_FUNC(merge_msg, "MERGE_MSG") REPO_GIT_PATH_FUNC(merge_rr, "MERGE_RR") REPO_GIT_PATH_FUNC(merge_mode, "MERGE_MODE") REPO_GIT_PATH_FUNC(merge_head, "MERGE_HEAD") -REPO_GIT_PATH_FUNC(merge_autostash, "MERGE_AUTOSTASH") -REPO_GIT_PATH_FUNC(auto_merge, "AUTO_MERGE") REPO_GIT_PATH_FUNC(fetch_head, "FETCH_HEAD") REPO_GIT_PATH_FUNC(shallow, "shallow") |