Re: [RFD] should all merge bases be equal?

2017-02-09 Thread Junio C Hamano
Michael Haggerty writes: > Anyway, I mostly wanted to remind you of the earlier discussion of this > topic. There's a lot more information there. > > Michael > > [1] http://public-inbox.org/git/539a25bf.4060...@alum.mit.edu/ Your http://public-inbox.org/git/53a3f67a.80...@alum.mit.edu/ in the th

Re: [RFD] should all merge bases be equal?

2017-02-09 Thread Michael Haggerty
On 10/18/2016 12:28 AM, Junio C Hamano wrote: > [...] > Being accustomed how fast my merges go, there is one merge that > hiccups for me every once in a few days: merging back from 'master' > to 'next'. [...] > > The reason why this merge is slow is because it typically have many > merge bases.

[RFD] should all merge bases be equal?

2016-10-17 Thread Junio C Hamano
People can see how fast the usual merges I see everyday are by looking at output from $ git log --first-parent --format='%ct %s' master..pu and noticing the seconds since epoch. Most of the days, these are recreated directly on top of 'master' from scratch, and they get timestamps that are v