From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: Re: [PATCH 2/2] Re: rebase -i: explain how to discard all commits Date: Sun, 23 Jan 2011 21:10:40 +0100 (CET) Message-ID: References: <20110120195726.GA11702@burratino> <20110120200827.GB14184@vidovic> <201101202134.41911.trast@student.ethz.ch> <7vfwsnqn8c.fsf@alter.siamese.dyndns.org> <7vsjwmp5cs.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Thomas Rast , Nicolas Sebrecht , Jonathan Nieder , Matthieu Moy , git@vger.kernel.org, Kevin Ballard , Yann Dirson , Eric Raible To: Junio C Hamano X-From: git-owner@vger.kernel.org Sun Jan 23 21:10:57 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ph6H1-0001WF-Ra for gcvg-git-2@lo.gmane.org; Sun, 23 Jan 2011 21:10:56 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752123Ab1AWUKr (ORCPT ); Sun, 23 Jan 2011 15:10:47 -0500 Received: from mailout-de.gmx.net ([213.165.64.23]:42910 "HELO mailout-de.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751791Ab1AWUKq (ORCPT ); Sun, 23 Jan 2011 15:10:46 -0500 Received: (qmail invoked by alias); 23 Jan 2011 20:10:44 -0000 Received: from pD9EB0B0C.dip0.t-ipconnect.de (EHLO noname) [217.235.11.12] by mail.gmx.net (mp067) with SMTP; 23 Jan 2011 21:10:44 +0100 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX19MAep8845MuY5akx3CmHCi6Zu0UX3t2Wk6dSI4hs uf1NtIKh1SDDbc X-X-Sender: gene099@bonsai2 In-Reply-To: <7vsjwmp5cs.fsf@alter.siamese.dyndns.org> User-Agent: Alpine 1.00 (DEB 882 2007-12-20) X-Y-GMX-Trusted: 0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Hi, On Fri, 21 Jan 2011, Junio C Hamano wrote: > 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? Oh, so you want to suggest using "reset --hard" but warn at the same time that this command on its own is dangerous unless you run rebase first? :-) Ciao, Johannes