{"thread":{"id":"16673","subject":"Removing a merge commit","startedAt":"2008-12-10T20:20:00Z","lastAt":"2008-12-11T00:24:05Z","messageCount":2,"participants":["Ray Morgan","Jeff Whiteside"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"97523","messageId":"4A07B3ED-D048-4455-B4C3-5DAB1F8E6965@mac.com","threadId":"16673","inReplyTo":null,"subject":"Removing a merge commit","fromName":"Ray Morgan","fromEmail":"raycmorgan@mac.com","sentAt":"2008-12-10T20:20:00Z","receivedAt":"2008-12-10T20:20:00Z","isPatch":false,"sender":{"key":"raycmorgan@mac.com","avatar":null},"body":"Hello,\n\nTo build a release for our site, we merge branches that developers  \ncreate. We do this with --no-ff in order to make it only one commit to  \npull if it fails QA. Say the qa branch's history has 4 merge commits  \nin a row, is there any way to remove the 3rd (just pulling it out..  \nmuch like how a rebase works)?\n\nCurrently we just checkout below that failed branch and re-merge  \neverything above it.. but that just seems very clumsy (and manual).\n\nThanks!\nRay\n"},{"id":"97551","messageId":"3ab397d0812101624h77c5198bqd38f30dee1830605@mail.gmail.com","threadId":"16673","inReplyTo":"4A07B3ED-D048-4455-B4C3-5DAB1F8E6965@mac.com","subject":"Re: Removing a merge commit","fromName":"Jeff Whiteside","fromEmail":"jeff.m.whiteside@gmail.com","sentAt":"2008-12-11T00:24:05Z","receivedAt":"2008-12-11T00:24:05Z","isPatch":false,"sender":{"key":"jeff.m.whiteside@gmail.com","avatar":null},"body":"Isn't this what you want? (taken from\nhttp://www.kernel.org/pub/software/scm/git/docs/git-rebase.html)\n\n\n\nA range of commits could also be removed with rebase. If we have the\nfollowing situation:\n\n    E---F---G---H---I---J  topicA\n\nthen the command\n\ngit rebase --onto topicA~5 topicA~3 topicA\n\nwould result in the removal of commits F and G:\n\n    E---H'---I'---J'  topicA\n\n\n\nOn Wed, Dec 10, 2008 at 12:20 PM, Ray Morgan <raycmorgan@mac.com> wrote:\n> Hello,\n>\n> To build a release for our site, we merge branches that developers create.\n> We do this with --no-ff in order to make it only one commit to pull if it\n> fails QA. Say the qa branch's history has 4 merge commits in a row, is there\n> any way to remove the 3rd (just pulling it out.. much like how a rebase\n> works)?\n>\n> Currently we just checkout below that failed branch and re-merge everything\n> above it.. but that just seems very clumsy (and manual).\n>\n> Thanks!\n> Ray\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n>\n"}]}