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

Git and Quilt

From
JTJimmy Thrasibule <thrasibule.jimmy@gmail.com>
Date
Jul 9, 2012, 11:57 UTC
Message-ID
<1341835029.10119.36.camel@sysadmin>
Hello,

I have a core project on which I maintain a set of patches using Quilt. This allows me to make changes to the project without touching the files so I can upgrade to new versions easily.

I keep my patches and the core project in a Git repository. When I want to change something, I apply my patches using Quilt, then I revert all my changes and I just commit the resulting patch.

I would like to have a branch where all my patches are applied to deploy the code but I can't find any good way to do this.

If I create a new branch from master and apply the patches, I will have conflicts on the next merge. I need something to apply the patches before the merge (maybe using one of the hooks?).

Any idea?

-- Jimmy

Next: Konstantin Khomoutov
Message 1 of 4 in “Git and Quilt”
  1. Jimmy ThrasibuleJul 9, 2012
  2. Konstantin KhomoutovJul 9, 2012
  3. Jimmy ThrasibuleJul 9, 2012
  4. Jiang XinJul 9, 2012

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.