From: Matthieu Moy Date: Fri, 21 Jan 2011 17:05:56 GMT Subject: Re: [PATCH 2/2] Re: rebase -i: explain how to discard all commits Message-ID: In-Reply-To: <7vsjwmp5cs.fsf@alter.siamese.dyndns.org> Junio C Hamano writes: > Johannes Schindelin writes: > >>> Wouldn't that suggest us that if we were to do anything to this message >>> it would be a good idea to teach the user to "reset --hard" the branch >>> if no commits truly needs to be replayed on top of the onto-commit? >> >> The important difference between rebase -i && noop on the one, and reset >> --hard on the other hand is that the latter is completely unsafe. I mean, >> utterly completely super-unsafe. And I say that because _this here >> developer_ who is not exactly a Git noob lost stuff that way. > > I think "rebase" already checks that the index and the working tree is > clean before starting, so referring to "reset --hard" when "rebase -i" > notices there is absolutely nothing to do is _not_ unsafe, no? The point is not about letting rebase do a "reset --hard", but to tell the user s/he should have ran "reset --hard" instead of rebase. The danger is to teach the user's fingers to type "reset --hard" too often, which is unsafe ;-). -- Matthieu Moy http://www-verimag.imag.fr/~moy/