From: Junio C Hamano <junkio@cox.net>
Date: Wed, 24 Aug 2005 18:35:50 GMT
Subject: Re: [PATCH] Introduce "reset type" flag to "git reset"
Message-ID: <7vk6ibdvy1.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <7vacj8nw5v.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> writes:

> Sam Ravnborg <sam@ravnborg.org> writes:
>
>> But --soft, --hard looks rather confusing to me.
>>
>> Something like --force or --prune may be a bit more intuitive, and let
>> default behaviour be the one you name --soft for now.
>
> I do not have objections to removing --mixed, but I do not find
> --force/--prune any less confusing than --soft/--hard.  Its just
> a terminology so once people get used to it anything would do.
> But I agree that we need to come up with a good name for them.
> I do not think --force/--prune is it, though.

Names aside, I have a feeling that "git reset --hard HEAD" is
what "git checkout -f HEAD" should have done.  As it stands, the
latter leaves files not in HEAD but in the previous tree behind.

Comments?