From: Junio C Hamano <junkio@cox.net>
Date: Tue, 23 Aug 2005 22:08:44 GMT
Subject: Re: [PATCH] Introduce "reset type" flag to "git reset"
Message-ID: <7vacj8nw5v.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20050823202637.GA8061@mars.ravnborg.org>

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.

> I think it would make sense to be able to specify the topmost SHA1 (or 
> HEAD:5 or HEAD^^^^^) from where the reset should start.

"git reset --hard HEAD~5" should work.  Sorry, the colon ":"
turns out to be confusing to refspec notation <src>:<dst> used
in fetch/push and was replaced with a tilde "~" some time ago.