From: Steven Grimm Date: Wed, 28 Nov 2007 21:58:59 GMT Subject: Re: Rollback of git commands Message-ID: <795F24E6-9145-4007-95EB-DB63D9F6295A@midwinter.com> In-Reply-To: On Nov 28, 2007, at 1:47 PM, Daniel Barkalow wrote: > (That is, "git rebase -i" seems > to work fine for making changes to a single logical patch series, > all of > whose patches are prepared locally and aren't independantly named in > some > particular fashion; the things that aren't handled are "I need to > replace > the pull of netdev.git with a new pull of netdev.git" or "I need to > replace '[PATCH] fix-the-frobnozzle-gadget' with > '[PATCH v2] fix-the-frobnozzle-gadget'.) I use rebase -i for that last case and it works fine -- I mark the appropriate commit as "edit" in the patch list and the rebase stops there, at which point I can update the patch in any way I see fit: tweak it a bit, replace it with a different change entirely, change the commit message, etc. What's missing from rebase -i in that respect? I guess it's not as easy to script for automated patch replacement. -Steve