From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Apr 2017 03:17:35 GMT
Subject: Re: [PATCH 2/2] config: handle conditional include when $GIT_DIR is not set up
Message-ID: <xmqqvaq2flps.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CACsJy8D-=3qPbEO-dq2+Mr-WZ+5RrivkSw9NX7_FhEJFy+59zA@mail.gmail.com>

Duy Nguyen <pclouds@gmail.com> writes:

> (To Junio, this series conflicts slightly with
> nd/conditional-config-include, let me know if you want me to rebase
> this on top of that)

I think I can manage---having to resolve inter-topic conflict every
once in a while is a good sanity check for me anyway ;-).  Please
holler if my resolution is faulty when I push things out tonight my
time (note: I'll be operating in GMT+9 for coming weeks).

Thanks.