From: Jimmy Thrasibule <thrasibule.jimmy@gmail.com>
To: Konstantin Khomoutov <kostix+git@007spb.ru>
Cc: git@vger.kernel.org
Subject: Re: Git and Quilt
Date: Mon, 09 Jul 2012 15:00:29 +0200 [thread overview]
Message-ID: <1341838829.10119.42.camel@sysadmin> (raw)
In-Reply-To: <20120709162042.0149100574d2d04497a952fc@domain007.com>
> 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
Yes it can do the work, but I afraid that it gets messy in a
collaborative work as said at the end of the article. I prefer to
maintain my patches using Quilt so everything is clear.
--
Jimmy
next prev parent reply other threads:[~2012-07-09 13:00 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
2012-07-09 13:00 ` Jimmy Thrasibule [this message]
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=1341838829.10119.42.camel@sysadmin \
--to=thrasibule.jimmy@gmail.com \
--cc=git@vger.kernel.org \
--cc=kostix+git@007spb.ru \
/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).