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: Cleaning up git user-interface warts Date: Wed, 15 Nov 2006 14:17:55 -0800 Message-ID: <87slgks6b0.wl%cworth@cworth.org> References: <87k61yt1x2.wl%cworth@cworth.org> <455A1137.8030301@shadowen.org> <87hcx1u934.wl%cworth@cworth.org> <20061114194707.GH7201@pasky.or.cz> <87d57pu4qa.wl%cworth@cworth.org> <7v3b8lv9c9.fsf@assigned-by-dhcp.cox.net> <87wt5wsabs.wl%cworth@cworth.org> <20061115220054.GA24861@spearce.org> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/signed; boundary="pgp-sign-Multipart_Wed_Nov_15_14:17:50_2006-1"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit NNTP-Posting-Date: Wed, 15 Nov 2006 22:18:28 +0000 (UTC) Cc: Jakub Narebski , git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org In-Reply-To: <20061115220054.GA24861@spearce.org> 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 ciao.gmane.org with esmtp (Exim 4.43) id 1GkT5G-00059z-Bz for gcvg-git@gmane.org; Wed, 15 Nov 2006 23:18:18 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161981AbWKOWSP (ORCPT ); Wed, 15 Nov 2006 17:18:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161982AbWKOWSP (ORCPT ); Wed, 15 Nov 2006 17:18:15 -0500 Received: from theworths.org ([217.160.253.102]:13469 "EHLO theworths.org") by vger.kernel.org with ESMTP id S1161981AbWKOWSO (ORCPT ); Wed, 15 Nov 2006 17:18:14 -0500 Received: (qmail 19039 invoked from network); 15 Nov 2006 17:18:12 -0500 Received: from localhost (HELO raht.cworth.org) (127.0.0.1) by localhost with SMTP; 15 Nov 2006 17:18:12 -0500 To: Shawn Pearce Sender: git-owner@vger.kernel.org --pgp-sign-Multipart_Wed_Nov_15_14:17:50_2006-1 Content-Type: text/plain; charset=US-ASCII On Wed, 15 Nov 2006 17:00:54 -0500, Shawn Pearce wrote: > > There is git-stash/git-unstash floating somewhere in the archive. Yes, I did write those once upon a time. ;-) It's the manual stash/unstash that I don't want though. I want to be able to make this happen automatically when switching branches. > I find that a "git commit -a -m parked; git checkout -b ..." works > well to stash my current stuff off. Then I just amend the commit > when I come back to that branch. Yes, I do stuff like that as well. And often "reset HEAD~" instead of amend, (always with a moment's pause as reset justly deserves). > The problem I just ran into today was "git checkout" doesn't double > check the file stat data against the index before switching branches. > If the file is unchanged between the two branches there's no error. > So I switched branches with dirty files that I forgot to park on > the old branch. Right, so that's just more evidence that this approach is a little awkward. Anyway, the stashing thing I want is a minor thing that should be easy to fix in git, (as is everything we're talking about here I think). -Carl --pgp-sign-Multipart_Wed_Nov_15_14:17:50_2006-1 Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQBFW5IT6JDdNq8qSWgRAlvMAJ0Za2TUAUhRffSMPfDOH4v+InsuLQCgi8db k1awTEEyzL+chGnSrkQ3hX4= =jIUR -----END PGP SIGNATURE-----