From: Asheesh Laroia Date: Mon, 25 Feb 2008 21:35:36 GMT Subject: Re: "Contributors never merge" and preserving history Message-ID: In-Reply-To: On Mon, 25 Feb 2008, Linus Torvalds wrote: > For example, let's say that you're developing a driver. If you start at > some specific kernel version (say, 2.6.24) and you do *not* generally > merge from my development tree, now suddenly other people can happily > pull from your tree to get the driver, even if they are stable kernels > or vendor kernels that don't want all the development crud that is in > my tree! > > See? Keeping a clean history actually makes your tree more useful! I'm going to chime in on this thread as a relative newcomer to git. If I'm developing a driver or other feature branch, and then a new upstream release comes along, I can't rebase and push - that would make the "is not a strict subset of local ref" complaint. Is the right workflow, then, to rebase against 2.6.25 in a new local branch, and push that to a new remote branch for others (like you say, vendor kernel maintainers) to pull from? Thanks! -- Asheesh. -- Who will take care of the world after you're gone?