From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Carl Worth Subject: Re: [PATCH] git-explain Date: Tue, 05 Dec 2006 16:07:20 -0800 Message-ID: <87bqmh28g7.wl%cworth@cworth.org> References: <200612031701.15594.alan@chandlerfamily.org.uk> <7v1wngwws6.fsf@assigned-by-dhcp.cox.net> <7vwt57j94c.fsf_-_@assigned-by-dhcp.cox.net> <46a038f90612051500w44438f70y3c7d1c99998d16bb@mail.gmail.com> <7vslfudjsa.fsf@assigned-by-dhcp.cox.net> <7vu009dhgz.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/signed; boundary="pgp-sign-Multipart_Tue_Dec__5_16:07:13_2006-1"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit NNTP-Posting-Date: Wed, 6 Dec 2006 00:08:08 +0000 (UTC) Cc: Johannes Schindelin , git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org In-Reply-To: <7vu009dhgz.fsf@assigned-by-dhcp.cox.net> User-Agent: Wanderlust/2.14.0 (Africa) Emacs/21.4 Mule/5.0 (SAKAKI) Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by dough.gmane.org with esmtp (Exim 4.50) id 1GrkKT-0003C4-D0 for gcvg-git@gmane.org; Wed, 06 Dec 2006 01:08:05 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758519AbWLFAIB (ORCPT ); Tue, 5 Dec 2006 19:08:01 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758509AbWLFAIB (ORCPT ); Tue, 5 Dec 2006 19:08:01 -0500 Received: from cworth.org ([217.160.249.188]:37886 "EHLO theworths.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758519AbWLFAIA (ORCPT ); Tue, 5 Dec 2006 19:08:00 -0500 Received: (qmail 13193 invoked from network); 5 Dec 2006 19:07:58 -0500 Received: from localhost (HELO raht.cworth.org) (127.0.0.1) by localhost with SMTP; 5 Dec 2006 19:07:58 -0500 To: Junio C Hamano Sender: git-owner@vger.kernel.org --pgp-sign-Multipart_Tue_Dec__5_16:07:13_2006-1 Content-Type: text/plain; charset=US-ASCII On Tue, 05 Dec 2006 15:57:00 -0800, Junio C Hamano wrote: > I originally wanted to do "git oops" which would have been a > universal "undo" command, and "explain" was only the first > smaller step toward that goal. But the more I think about it, I > feel that "undo" is less important. I like the idea of "git status" explaining what operations are "in progress" and what the user might want to do next to complete the operation. As for the desire for "undo", it probably makes sense to just keep focusing on making "git reset" a nice, safe way to undo any sort of "in progress" operation. The recent cleanup patches are in line with this. One thing that conflicts with that goal a bit is that git-reset is also used to move the current branch arbitrarily in the commit DAG, and also (with --hard) to discard local commits. Those are definitely less "safe" operations. -Carl --pgp-sign-Multipart_Tue_Dec__5_16:07:13_2006-1 Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQBFdgm46JDdNq8qSWgRApGZAJ4uqxqmc1kJHU/j2/n35HVLu3ZLPwCdHOiU HJDuoCjINdETE4XjUGpeIMI= =5aZA -----END PGP SIGNATURE-----