Re: 2.6.19 -mm merge plans

Jeff Garzik
2006-09-22T20:22:55Z

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