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

Merge commit before branch tip

From
Bradley Wagner <bradley.wagner@hannonhill.com>
Date
Jul 26, 2010, 15:38 UTC
Message-ID
<AANLkTikp5dHz97qp3pf+DE-wABNVYTGAQ+h30D9Fa04c@mail.gmail.com>

I realize this is not a best practice but is it possible to merge a branch but at a point before the branch tip?

This came up recently for us. There are 9 new commits in our stable branch that need to be merged back into "master". However, there is 1 commit (the branch tip) that we're not all that happy with and don't want to merge into the "master".

Ideally, I'd like them to show up as a merge rather than a cherry-pick basically as if I'd done the merge before that latest commit was made.

Next: Jonathan Nieder
Message 1 of 4 in “Merge commit before branch tip”
  1. Bradley WagnerJul 26, 2010
  2. Jonathan NiederJul 26, 2010
  3. Matthieu MoyJul 26, 2010
  4. Eugene SajineJul 26, 2010

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.