[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [patch: first impression]

From: Dmitry Gutov
Subject: Re: [patch: first impression]
Date: Tue, 18 Oct 2022 18:50:50 +0300
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2

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


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.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]