On Tue, Apr 19, 2011 at 11:09 AM, Francis Moreau <francis.moro@xxxxxxxxx> wrote: > On Tue, Apr 19, 2011 at 10:42 AM, Michael J Gruber > <git@xxxxxxxxxxxxxxxxxxxx> wrote: >> Francis Moreau venit, vidit, dixit 19.04.2011 09:32: >>> Hello, >>> >>> I'm wondering if it would be a good idea for git rebase to allow not >>> rebasing reverted patch which are part of the rebased branch. >>> >>> For example I'm currently rebasing my branch 'devel' onto master. This >>> branch have several commits and specially one called A and another one >>> called A' which reverts A. >>> >>> When rebasing 'devel' branch, rebase could try to drop both A and A'. >>> >>> What do you think ? >>> >>> BTW is there a way to do this currently ? >> >> You can do this with "rebase -i" by removing A and A' from the commit >> list (or squashing them or dealing with them in whatever way you like). > > Of course, but my point was to make this automatically... You can also change the A' commit title to "fixup! original_title" while reverting (there is no --fixup argument like "git commit" has), then git rebase -i would reorder the todo file for you. git revert gets confused by the resulting empty change but you can "git rebase --continue", or now that both are next to the other just remove them. HTH, Santi -- 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