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

How to manage merges from one line while excluding its merges from another

From
LBLane Brooks <lane@brooks.nu>
Date
Jun 25, 2010, 22:26 UTC
Message-ID
<4C252D1C.4010702@brooks.nu>
I have a tree like this:
      G---H---I---J---K   devel
     /       /       /
A---B---C---D---E---F    main
         \
          L---M---N---O   my

The 'my' branch forked off the 'main' line and for reasons out of my control cannot merge the 'main' changes (D,E,F) back.

The 'devel' line is a another line that I need to track and merge from, but I only want the changes local to that branch that are not on from the mainline. i.e., I only want commits G,H,J.

I want to continue to merge from the devel line as additional commits are made that are not on the main branch, but I do not want any of the future merge commits.

Is there an automated way to do this or do I have to cherry pick everything by hand?

Thanks, Lane

Next: Jonathan Nieder
Message 1 of 4 in “How to manage merges from one line while excluding its merges from another”
  1. Lane BrooksJun 25, 2010
  2. Jonathan NiederJun 26, 2010
  3. Lane BrooksJun 26, 2010
  4. Jonathan NiederJun 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.