Re: Git and Quilt
- From
- Jimmy Thrasibule <thrasibule.jimmy@gmail.com>
- Date
- Jul 9, 2012, 13:00 UTC
- Message-ID
- <1341838829.10119.42.camel@sysadmin>
- In-Reply-To
- <20120709162042.0149100574d2d04497a952fc@domain007.com>
Show 6 quoted lines
> 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