On Sun, Oct 16, 2022 at 11:15:58AM +0300, Eli Zaretskii wrote:
> > From: "Dr. Arne Babenhauserheide" <arne_bab@web.de>

[...]

> > There is also git pull --autostash
> 
> But --autostash is only valid when using --rebase, isn't it?

AFAIK not (anymore). It seems to be a historical artifact.

Still, of course, autostash leaves the user to cope with potential
conflicts. If there are conflicts, there's no way around them, of
course, but having the warning before ("you have changes in your
local repo, watch out!") seems somehow friendlier to me. Autostash
"magic" upon an unsuspecting user sounds like a pretty sharp tool.

Cheers
-- 
t