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 20:10:41 +0100 |
| commit | 3f921c75913a4ba7b73cb0d8ec05a2cf24d1f4d4 (patch) | |
| tree | 0b8f82e7ae8325cbb8d7795853d799792520a7b9 /path.h | |
| parent | sequencer: introduce functions to handle autostashes via refs (diff) | |
| download | git-3f921c75913a4ba7b73cb0d8ec05a2cf24d1f4d4.tar.xz git-3f921c75913a4ba7b73cb0d8ec05a2cf24d1f4d4.zip | |
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.h')
| -rw-r--r-- | path.h | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -175,7 +175,6 @@ const char *git_path_merge_msg(struct repository *r); const char *git_path_merge_rr(struct repository *r); const char *git_path_merge_mode(struct repository *r); const char *git_path_merge_head(struct repository *r); -const char *git_path_merge_autostash(struct repository *r); const char *git_path_fetch_head(struct repository *r); const char *git_path_shallow(struct repository *r); |