git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Removing a merge commit

From
RMRay Morgan <raycmorgan@mac.com>
Date
Dec 10, 2008, 20:20 UTC
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

Next: Jeff Whiteside
Message 1 of 2 in “Removing a merge commit”
  1. Ray MorganDec 10, 2008
  2. Jeff WhitesideDec 11, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.