On Sun, Aug 14, 2011 at 1:38 AM, Jim Cromie <jim.cromie@xxxxxxxxx> wrote: > going further, if git rebase -i had ability to "back" a fixup patch > back to where it should have been, and adjust the intervening patches > where conflict would normally happen, that would be awesome. > Simplistically, this would just shift the patch 1 step back iteratively, > until it wouldnt apply properly, and then --abort, stopping at the last > clean rebase. > > apologies if this is too hair-brained, or already done. It sounds like you're looking for several git commit (-p|--interactive) --fixup <commit>, followed by a git rebase -i --autosquash. It's not quite as automatic as you describe, but I think that automating it would be pretty hard to do correctly. Conrad -- 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