On 04/19/2011 11:09 AM, Francis Moreau 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... > That would be akin to removing in-code comments of why it's a bad idea to implement a particular solution in a particular way, and it also removes the capability of reverting the revert (ie, re-doing the change) at a later time when stability can be sacrificed temporarily. -- Andreas Ericsson andreas.ericsson@xxxxxx OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 Considering the successes of the wars on alcohol, poverty, drugs and terror, I think we should give some serious thought to declaring war on peace. -- 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