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

Re: How to merge branches except for one commit

From
Avery Pennarun <apenwarr@gmail.com>
Date
May 29, 2008, 02:42 UTC
Message-ID
<32541b130805281942g2550cad9k7ba530c59e050aa4@mail.gmail.com>
In-Reply-To
<216e54900805281932v1397fd30sad91f767175ba95e@mail.gmail.com>
On 5/28/08, Andrew Arnott <andrewarnott@gmail.com> wrote:
>  At some point, most or all the commits on master since branching off
>  v1.0 I want to include in the v1.1 release.

I think this is perhaps the root of your problem. Normally people don't merge from master into their bugfix release; they do it the other way around, making bugfixes in the bugfix branch, and merging them occasionally into master.

Or alternatively, they cherry pick just *some* of the changes from master back into the bugfix release, because presumably there are also a bunch of non-critical new feature patches sitting in master.

If you really want to do it the way you described, an easy answer might be to just merge the entire master into v1.1, then "git revert" (in v1.1) the patch that changes the version number :)

Have fun,
Avery
Previous: Andrew ArnottNext: Andrew Arnott
Message 2 of 7 in “How to merge branches except for one commit”
  1. Andrew ArnottMay 29, 2008
  2. Avery PennarunMay 29, 2008
  3. Andrew ArnottMay 29, 2008
  4. Andreas EricssonMay 29, 2008
  5. Junio C HamanoMay 29, 2008
  6. Imran M YousufMay 29, 2008
  7. Andrew ArnottMay 29, 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.