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

Re: Merging (only) subdirectories

From
MKMartin Krüger <martin.krueger@gmx.com>
Date
Dec 1, 2010, 11:47 UTC
Message-ID
<20101201114759.136280@gmx.net>
In-Reply-To
<AANLkTimZc0r8WBOsE73V=7SKdZgONiCKfYCk7rBrCY3F@mail.gmail.com>
Show 7 quoted lines
> 
> The problem comes when Client A wants to purchase Theme B. We can't
> just merge the theme branch because all the rest of the project
> contains (potentially) a different version of Moodle. So we have to do
> lots of messing around to get the theme branch in and/or loose the
> theme commit history in the process.
> 
I would say you are not working best practice with git. The idea of commit is a atomic  change of the whole project.  It seems like you mixed completely unrelated changes in a commit.

You can try as a resolution: git rebase master (on a temporary-branch) git format-patch master

Strip the patches with filterdiff

Apply the stripped patches to another temporary-brach. Merge to the target-Branch.

Best regards
     martin
Previous: Howard MillerNext: Howard Miller
Message 2 of 9 in “Merging (only) subdirectories”
  1. Howard MillerDec 1, 2010
  2. Martin KrügerDec 1, 2010
  3. Howard MillerDec 1, 2010
  4. Howard MillerDec 1, 2010
  5. Nguyen Thai Ngoc DuyDec 1, 2010
  6. Howard MillerDec 1, 2010
  7. Enrico WeigeltDec 3, 2010
  8. Howard MillerDec 3, 2010
  9. Enrico WeigeltDec 3, 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.