Re: Some ideas for StGIT

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Aug 5, 2007, 13:56 UTC
Message-ID: <Pine.LNX.4.64.0708051452280.14781@racer.site>
In-Reply-To: <20070805133940.GA18835@filer.fsl.cs.sunysb.edu>

Hi,

On Sun, 5 Aug 2007, Josef Sipek wrote:

Show 6 quoted lines

> On Sat, Aug 04, 2007 at 10:31:30PM -0400, Shawn O. Pearce wrote:
> ...
> [rebase is complex but fun]
> 
> Great, but does git have something that could replace
> $QUILT_LIKE_APP refresh?

What does "refresh"? (I never used quilt, and probably never will, since rebase -i does what I need.)

> Sure, if you can take 2 commits and collapse them into one you could 
> fake it by creating a dummy commit with the new changes, and then 
> collapsing, but that's nasty - and reflog might not like that much :)

IIUC you want to edit/amend a patch in the middle of a series? Two ways to go about it:

	1) (preferred)

		* start rebase -i
		* mark the commit as "edit"
		* wait until rebase stops to let you edit it
		* edit, test, commit --amend
		* rebase --continue

	2) (not so preferred, but often convenient)

		* fix bug
		* commit with a dummy message
		* rebase -i
		* move commit just after the commit-to-edit
		* mark second as "squash"
		* when the editor comes up, just delete the second 
		  commit's message, and possibly adjust the first's

Hth, Dscho