Removing a merge commit

Removing a merge commit

[Ray Morgan]

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

Re: Removing a merge commit

[Jeff Whiteside]

Isn't this what you want? (taken from
http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html)



A range of commits could also be removed with rebase. If we have the
following situation:

    E---F---G---H---I---J  topicA

then the command

git rebase --onto topicA~5 topicA~3 topicA

would result in the removal of commits F and G:

    E---H'---I'---J'  topicA



On Wed, Dec 10, 2008 at 12:20 PM, Ray Morgan <raycmorgan@mac.com> wrote:
> 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
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>