Git and Quilt

2012-07-09 Thread Jimmy Thrasibule
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

Re: Git and Quilt

2012-07-09 Thread Jimmy Thrasibule
Isn't what you're doing a perfect fit for rebasing [1]? That is, you keep your changes as a series of commits on top of your upstream branch and each time you're about to bring upstream changes in, you rebase your local branch on top on the updated upstream branch. 1.