Re: Dividing up a large merge.

From: Larry D'Anna <larry@elder-gods.org>
Date: Jul 15, 2009, 14:47 UTC
Message-ID: <20090715144739.GA14846@cthulhu>
In-Reply-To: <20090715122828.GA6570@mit.edu>

* Theodore Tso (tytso@mit.edu) [090715 08:28]:

Show 7 quoted lines

> And, if you believe your release cycle is going to run for more than,
> say, 2-3 months, I suggest that you keep things in a single linear
> patch stream.  You can keep the patch series under git control, and
> then rebase periodically; I'd suggest rebasing once a mainline release
> happens (i.e., when 2.6.X is released), and then again after most of
> the major changes have been merged in and the tree has settled down
> (i.e., after 2.6.X-rc2 or 2.6.X-rc3).

or use TopGit

http://repo.or.cz/w/topgit.git

        --larry