On Sun, Aug 05, 2007 at 02:56:23PM +0100, Johannes Schindelin wrote: > Hi, > > On Sun, 5 Aug 2007, Josef Sipek wrote: > > > 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.) You understood correctly...see below. > > 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 Ewww...that doesn't seem to scale (read: far too much to type) :) Here's a quilt/guilt/stgit equivalent: $APP push <patchname> or (depending on where you are in the patch stack) $APP pop <patchname> <edit> $APP refresh # this is the commit --amend part Josef 'Jeff' Sipek. -- The reasonable man adapts himself to the world; the unreasonable one persists in trying to adapt the world to himself. Therefore all progress depends on the unreasonable man. - George Bernard Shaw - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
