Hi, On Tue, 23 May 2017, Junio C Hamano wrote: > Jonathan Nieder <jrnieder@xxxxxxxxx> 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