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.
