From: Ray Morgan <raycmorgan@mac.com>
Date: Wed, 10 Dec 2008 20:20:00 GMT
Subject: Removing a merge commit
Message-ID: <4A07B3ED-D048-4455-B4C3-5DAB1F8E6965@mac.com>

Hello,

To build a release for our site, we merge branches that developers  
create. We do this with --no-ff in order to make it only one commit to  
pull if it fails QA. Say the qa branch's history has 4 merge commits  
in a row, is there any way to remove the 3rd (just pulling it out..  
much like how a rebase works)?

Currently we just checkout below that failed branch and re-merge  
everything above it.. but that just seems very clumsy (and manual).

Thanks!
Ray