From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 May 2017 03:35:45 GMT
Subject: Re: [PATCH v3 1/6] Fix build with core.autocrlf=true
Message-ID: <xmqqh90cmei6.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20170522175709.GC17710@aiede.svl.corp.google.com>

Jonathan Nieder <jrnieder@gmail.com> writes:

> Junio, how do you prefer to handle this in git.git?  Would you need to
> amend the patch to remove the git-gui/.gitattributes change and wait
> to get it from Pat, or is getting the same change twice okay?

Yes, getting the same change twice should be fine.  I'll see
conflicts when I update from Pat when it happens next time, but we
know what the resolution should be already.