Re: Bug report: git clone with dest
- Date: Fri, 05 Jan 2018 12:45:03 -0800
- From: Junio C Hamano <gitster@xxxxxxxxx>
- Subject: Re: Bug report: git clone with dest
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 ;-)
I do not recall how it was before 2012.