From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carl Worth Subject: Re: Using StGIT for tweaking already-committed stuff Date: Thu, 10 May 2007 14:16:43 -0700 Message-ID: <87sla42xc4.wl%cworth@cworth.org> References: <1178794261.5806.98.camel@murta.transitives.com> <4643049C.3D5F30D8@eudaptics.com> <87wszg39cp.wl%cworth@cworth.org> <20070510171457.GK13719@fieldses.org> <87vef0350y.wl%cworth@cworth.org> <20070510192106.GB4489@pasky.or.cz> <87tzuk31fu.wl%cworth@cworth.org> <20070510200253.GD4489@pasky.or.cz> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/signed; boundary="pgp-sign-Multipart_Thu_May_10_14:16:38_2007-1"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit Cc: "J. Bruce Fields" , Linus Torvalds , Johannes Sixt , catalin.marinas@gmail.com, git@vger.kernel.org To: Petr Baudis X-From: git-owner@vger.kernel.org Thu May 10 23:17:27 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HmG0m-0003ua-J1 for gcvg-git@gmane.org; Thu, 10 May 2007 23:17:20 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757937AbXEJVQu (ORCPT ); Thu, 10 May 2007 17:16:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761388AbXEJVQu (ORCPT ); Thu, 10 May 2007 17:16:50 -0400 Received: from theworths.org ([217.160.253.102]:42964 "EHLO theworths.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758381AbXEJVQt (ORCPT ); Thu, 10 May 2007 17:16:49 -0400 Received: (qmail 26640 invoked from network); 10 May 2007 17:16:44 -0400 Received: from localhost (HELO raht.cworth.org) (127.0.0.1) by localhost with SMTP; 10 May 2007 17:16:44 -0400 In-Reply-To: <20070510200253.GD4489@pasky.or.cz> User-Agent: Wanderlust/2.14.0 (Africa) Emacs/21.4 Mule/5.0 (SAKAKI) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: --pgp-sign-Multipart_Thu_May_10_14:16:38_2007-1 Content-Type: text/plain; charset=US-ASCII On Thu, 10 May 2007 22:02:53 +0200, Petr Baudis wrote: > > I'm sorry, I couldn't parse this. :-) > I'll try again. I like the git user interface. I like it a lot. (It's got a couple of tiny things that I would do differently if I could start over, but more importantly it has a lot of big things that I wouldn't have even thought of if I had started from scratch.) But with respect to the current topic, there are a couple of features that the git interface is missing compared to something like stg: 1. Amend a commit that's somewhere besides the tip of a branch, (rebuilding every commit that follows) 2. Re-ordering commits that exist on a branch, (again, rebuilding every commit that follows). And what I was trying to say in my confusing paragraph, is that if I look to stg to add one or both pieces of this functionality, then it comes with a lot of baggage. For example, "stg --help" lists about 38 sub-commands. And some of those are wholly unnecessary if already using git, (4 repository commands 6 working-copy commands, for example). While others exist only to allow a notion of "git commits" vs. "stg commits" and translating back and forth between them, (assimilate and uncommit for example). Now, that's not a critique of stg itself. As you say, it can work really well if you use it in a standalone fashion to track some project. I'd just love to see something more minimal, and incorporated into git itself, to address the missing functionality. Right now, "cherry-pick A..B" is all I have to suggest. But maybe later there could be some sort of push/pop addition as well, (except that obviously the name "push" isn't available as a sub-command). -Carl --pgp-sign-Multipart_Thu_May_10_14:16:38_2007-1 Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBGQ4u76JDdNq8qSWgRAhnqAJ9zNZFirKtz0wiY0FJiM6pmuE7CnQCfbYqV IGSZwbHg+MeYNDncE/Y0enA= =ApAq -----END PGP SIGNATURE----- --pgp-sign-Multipart_Thu_May_10_14:16:38_2007-1--