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.) > 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 - 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
