Removing a merge commit

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux