Toby Allsopp <[EMAIL PROTECTED]> writes: > On Fri, Mar 14 2008, Matthieu Moy wrote: > >> Sam Steingold <[EMAIL PROTECTED]> writes: >> >>> all I am asking at this time is an option to help me avoid doing "hg >>> rollback" all the time (btw, what is the bzr/git analogue or >>> rollback?) >> >> bzr uncommit >> git reset --hard HEAD^ > > I don't think you want --hard there; that will lose the changes that you > checked in, whereas --mixed, which is the default, will leave the > working files alone.
Right. git reset --hard will really discard the changes (the uncommited ones, and the ones commited in HEAD). If it's about re-commiting the same thing in another manner, it's not the right thing. BTW, in this case, you also have git commit --amend which is precisely what you want (roughly, uncommit + commit). -- Matthieu _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
