Re: [PATCH] Introduce "reset type" flag to "git reset"

2005-08-24 Thread Junio C Hamano
Junio C Hamano <[EMAIL PROTECTED]> writes: > Sam Ravnborg <[EMAIL PROTECTED]> 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 object

Re: [PATCH] Introduce "reset type" flag to "git reset"

2005-08-23 Thread Yasushi SHOJI
At Tue, 23 Aug 2005 17:22:47 -0700, Junio C Hamano wrote: > > Yasushi SHOJI <[EMAIL PROTECTED]> writes: > > > for --hard option, what you want to do is to completely revert the > > current state of your index file and work tree to known point. > > > > for that, how about git-revert-script? > > "

Re: [PATCH] Introduce "reset type" flag to "git reset"

2005-08-23 Thread Junio C Hamano
Yasushi SHOJI <[EMAIL PROTECTED]> writes: > for --hard option, what you want to do is to completely revert the > current state of your index file and work tree to known point. > > for that, how about git-revert-script? "git revert" is to create a commit that reverts a previous commit, which I thi

Re: [PATCH] Introduce "reset type" flag to "git reset"

2005-08-23 Thread Yasushi SHOJI
At Tue, 23 Aug 2005 15:08:44 -0700, Junio C Hamano wrote: > > Sam Ravnborg <[EMAIL PROTECTED]> 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. >

Re: [PATCH] Introduce "reset type" flag to "git reset"

2005-08-23 Thread Junio C Hamano
Sam Ravnborg <[EMAIL PROTECTED]> 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/--

Re: [PATCH] Introduce "reset type" flag to "git reset"

2005-08-23 Thread Sam Ravnborg
> 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