From: Harald Nordgren <haraldnordgren@gmail.com>
Date: Tue, 14 Apr 2026 18:44:09 GMT
Subject: Re: [PATCH] checkout: add --autostash option for branch switching
Message-ID: <20260414184409.82539-1-haraldnordgren@gmail.com>
In-Reply-To: <ebb65b1d-879f-4d9f-b25e-fe1c58a47ff7@gmail.com>

> > diff --git a/sequencer.h b/sequencer.h
> > index 5d3bc83314..b0c891d3b6 100644
> > --- a/sequencer.h
> > +++ b/sequencer.h
> > @@ -237,6 +237,10 @@ int save_autostash_ref(struct repository *r, const char *refname);
> >   int apply_autostash(const char *path);
> >   int apply_autostash_oid(const char *stash_oid);
> >   int apply_autostash_ref(struct repository *r, const char *refname);
> > +int apply_autostash_ref_with_labels(struct repository *r, const char *refname,
> > +                                 const char *label_ours, const char *label_theirs,
> > +                                 const char *label_base,
> > +                                 const char *stash_msg);

Fair enough, will update in the next patch!


Harald