Re: [patch: first impression]

[Dmitry Gutov]

On 18.10.2022 18:38, Uwe Brauer wrote:
> I am confused now! That description sounds like
> hg update
>
> to me
> but it seems git reset --soft would not call a merge in the case you
> describe

Right.

> what's about
>
>
> hg update -C
>
> Or is that more like git reset --hard?

Yes, 'hg update -C' is like 'git reset --hard', it that it discards 
uncommitted changes. 'hg update' tries to merge them instead. Just like 
'git checkout' might do. Either way, they generally change file contents 
on disk.

'git reset --soft' (or just 'git reset') doesn't touch file contents on 
disk.