Web lists-archives.com

Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)




Duy Nguyen <pclouds@xxxxxxxxx> writes:

> On Wed, Mar 6, 2019 at 8:34 AM Junio C Hamano <gitster@xxxxxxxxx> wrote:
>> * tg/checkout-no-overlay (2019-02-04) 9 commits
>>   (merged to 'next' on 2019-02-04 at 9968bcf4fb)
>>  Will hold.
>
> If it's ready for master, I'd love to see it merged. Either that or
> topic is rebased on 'master'. There are separate checkout changes in
> 'master' (mine, sadly), and because switch/restore moves lots of code
> around, I need to create a merge of this topic and master as the base,
> or you'll get horrible conflicts.

Yeah, that would make it easier for me ;-)