global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 09:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

refs: convert MERGE_AUTOSTASH to become a normal pseudo-ref

Browse Source 
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>
This commit is contained in:
Patrick Steinhardt
2024-01-19 11:40:19 +01:00
committed by Junio C Hamano
parent 35122daebc
commit 3f921c7591
8 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
repository.h
View File

@@ -67,7 +67,6 @@ struct repo_path_cache {
char *merge_rr;
char *merge_mode;
char *merge_head;
char *merge_autostash;
char *fetch_head;
char *shallow;
};