From 3f921c75913a4ba7b73cb0d8ec05a2cf24d1f4d4 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 19 Jan 2024 11:40:19 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- path.c | 1 - 1 file changed, 1 deletion(-) (limited to 'path.c') diff --git a/path.c b/path.c index f881c03171..0fb527918b 100644 --- a/path.c +++ b/path.c @@ -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") -- cgit 1.2.3-korg