Re: [PATCH v3 1/6] Fix build with core.autocrlf=true

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: May 23, 2017, 09:01 UTC
Message-ID: <alpine.DEB.2.21.1.1705231057510.3610@virtualbox>
In-Reply-To: <xmqqh90cmei6.fsf@gitster.mtv.corp.google.com>

Hi,

On Tue, 23 May 2017, Junio C Hamano wrote:

Show 9 quoted lines

> 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.

FWIW the reason why I did not open a Pull Request in https://github.com/patthoyts/git-gui for this change (which I had originally considered) is that I already have a couple of Pull Requests open in that repository, and they are rotting for over half a year already (and will soon compete with certain Icelandic delicacies):

https://github.com/patthoyts/git-gui/pulls/dscho

Ciao, Dscho