From: Sam Ravnborg Date: Tue, 23 Aug 2005 20:26:37 GMT Subject: Re: [PATCH] Introduce "reset type" flag to "git reset" Message-ID: <20050823202637.GA8061@mars.ravnborg.org> In-Reply-To: <7vu0hhzcj1.fsf@assigned-by-dhcp.cox.net> > I am not sure what mixed reset (the current behaviour) is good > for. If nobody comes up with a good use case it may not be a > bad idea to remove it. Using the principle of minimum suprise the --mixed should be removed. --soft - undo the commit leaving all changes. --hard - undo the commit and removing all changes I'm a cogito user so not used to got options. 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 think it would make sense to be able to specify the topmost SHA1 (or HEAD:5 or HEAD^^^^^) from where the reset should start. Sam