On Fri, Jan 05, 2018 at 12:45:03PM -0800, Junio C Hamano wrote: > Jeff King <peff@xxxxxxxx> writes: > > > Out of curiosity, did this change at some point? I thought the process > > used to be to merge to maint, and then pick up topics in master by > > merging maint to master. > > If you look at "Sync with maint" merges made to 'master', you'd > notice that most of them are only updating Documentation/RelNotes/* > and otherwise no-effect merges, simply because when such an up-merge > is made, everything in 'maint' is already in 'master' because topics > are merged to the latter first. Security fixes that go through > embargoes are excempt for obvious reasons ;-) OK, that makes sense. Pretty sure I did it wrong when I was interim maintainer back in the day, then. :) -Peff
