From: Jimmy Thrasibule <thrasibule.jimmy@gmail.com>
Date: Mon, 09 Jul 2012 11:57:09 GMT
Subject: Git and Quilt
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