At Sun, 16 Nov 2014 14:46:35 +0000, Mark Brown wrote:
On Sun, Nov 16, 2014 at 01:10:25PM +0100, Takashi Iwai wrote:
Mark Brown wrote:
One of the reasons I don't do that is that you don't have a branch which tracks Linus' tree merged into your own while I do track Linus' tree so once I've sent a pull request to you and another -rc has come out git has trouble constructing a sensible pull request, either the diffstat is bogus or the changelog is and I use both when reviewing what I'm sending.
Hm, but this does happen even if you send once, doesn't it?
No, I just send my pull request against Linus' tree. That just shows my changes which is fine. Then if I want to send a further request I either use his tree again and get all the previous changes included in the request or I use your tree and get everything in Linus' tree since -rc1. Either way it's hard to keep track.
If you need the merge of Linus tree beforehand, just let me know. I must review what I'm pulling, of course, so your demand is my demand, too.
It would help a lot to get a branch that's merged with the -rcs. I base all my merges off Linus' latest release since there's no sense testing without the latest bug fixes and this helps track what fixes still need to go.
OK, I'll merge Linus tree regularly to my master branch, which has already contain all my changes. You can send a pull request against it.
Takashi