From: Konstantin Khomoutov <kostix+git@007spb.ru>
To: Jimmy Thrasibule <thrasibule.jimmy@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Git and Quilt
Date: Mon, 9 Jul 2012 16:20:42 +0400 [thread overview]
Message-ID: <20120709162042.0149100574d2d04497a952fc@domain007.com> (raw)
In-Reply-To: <1341835029.10119.36.camel@sysadmin>
On Mon, 09 Jul 2012 13:57:09 +0200
Jimmy Thrasibule <thrasibule.jimmy@gmail.com> wrote:
> 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?).
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. http://git-scm.com/book/en/Git-Branching-Rebasing
next prev parent reply other threads:[~2012-07-09 12:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-09 11:57 Git and Quilt Jimmy Thrasibule
2012-07-09 12:20 ` Konstantin Khomoutov [this message]
2012-07-09 13:00 ` Jimmy Thrasibule
2012-07-09 15:38 ` Jiang Xin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120709162042.0149100574d2d04497a952fc@domain007.com \
--to=kostix+git@007spb.ru \
--cc=git@vger.kernel.org \
--cc=thrasibule.jimmy@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).