Hi Junio, On Mon, Dec 30, 2019 at 01:49:05PM -0800, Junio C Hamano wrote: > Denton Liu <liu.denton@xxxxxxxxx> writes: > > > Alban reported[1] that he expected merge to have an --autostash option, > > just like rebase. Since there's not really any reason why merge can't > > have it, let's implement it in this patchset. > > Sigh. > > I would actually have preferred to remove the autostash from rebase > if the goal is to have a consistent behaviour between the two, > though ;-) > > But it is OK as long as it does not degrade the codepath with > changes that wouldn't have been necessary if this weren't added. > > Let's see how it goes. Queued. Sorry for the radio silence for the past week. I've been offline trying to recover from a particularly bad flu. Anyway, I have a reroll of this topic planned with the `flags` change you suggested and addressing Philip's concerns about --no-commit. Since this is a new topic that definitely won't be accepted for v2.25.0, I'll probably be taking my time with this ;) Thanks, Denton
