Re: 2.6.19 -mm merge plans

From: Jeff Garzik
Date: Fri Sep 22 2006 - 16:23:14 EST


Roland Dreier wrote:
My way of handling this has been to wait until you've acted on my
first merge request before sending another one. I also don't touch my
published "for-linus" branch in git until you've pulled it. I just
batch up pending changes in my "for-2.6.19" branch until my next merge
(and I also encourage people interested in Infiniband to run my
for-2.6.19 branch)


That's pretty much what I do. I run a
git branch upstream-linus upstream

and then submit a pull request for the upstream-linus branch. That way, I can keep working and committing stuff, and don't have to wait for Linus to pull.

Then, after the pull, I delete the branch
git branch -D upstream-linus

locally, and repeat the process next time a bunch of changes are queued up.

Jeff


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/