diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-01-19 11:40:19 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-19 11:10:41 -0800 |
| commit | 3f921c75913a4ba7b73cb0d8ec05a2cf24d1f4d4 (patch) | |
| tree | 0b8f82e7ae8325cbb8d7795853d799792520a7b9 /path.c | |
| parent | 35122daebc8030ccc42f54fe4f08272091e4aa94 (diff) | |
| download | git-3f921c75913a4ba7b73cb0d8ec05a2cf24d1f4d4.tar.gz | |
refs: convert MERGE_AUTOSTASH to become a normal pseudo-ref
Similar to the preceding conversion of the AUTO_MERGE pseudo-ref, let's
convert the MERGE_AUTOSTASH ref to become a normal pseudo-ref as well.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'path.c')
| -rw-r--r-- | path.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1588,6 +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(fetch_head, "FETCH_HEAD") REPO_GIT_PATH_FUNC(shallow, "shallow") |