Re: Merging commits together into a super-commit

From: Petr Baudis <pasky@suse.cz>
Date: May 10, 2007, 19:21 UTC
Message-ID: <20070510192106.GB4489@pasky.or.cz>
In-Reply-To: <87vef0350y.wl%cworth@cworth.org>

On Thu, May 10, 2007 at 08:30:37PM CEST, Carl Worth wrote:

Show 7 quoted lines

> stg - This probably works great if you're using it as a primary
>       interface. But trying to use it as a quick one-off when
>       generally using core git does not work well at all. Instead of
>       the two "git tag" commands in my recipe above, an stg recipe
>       would involve a lot of additional bookkeeping with stg init, stg
>       uncommit [N times for fixing a commit N steps back in the
>       history], stg goto, stg push, etc.

I think you are underestimating stg here. You can stg init just once per branch (ever), I think. Then,

	stg uncommit -n N
	stg pop -n N-1
	..hack..
	stg refresh
	stg push -a

It seems to be a bit shorter than the sequence you've presented above, and overally working with volatile commits using StGIT feels much more natural to me - and I haven't even ever used quilt seriously! (I have special antipathy to the git reset UI, too.)

Few days ago Santi Bejar has sent me a bundle with some updates to the Git homepage (thanks again a lot!). Since I didn't want some of the patches and wanted to tweak others, what I eventually did was pretty much this: I fast-forwarded my master to his bundle's head, then uncommitted the patches, popped them all and repeated the sequence

	stg push
	..review..
		stg refresh
		stg commit
	..or..
		stg delete `stg top`

for each patch.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Ever try. Ever fail. No matter. // Try again. Fail again. Fail better.
		-- Samuel Beckett