Re: git merge and generated files?

From: Date: Wed, 28 Mar 2012 10:17:59 +0000
Subject: Re: git merge and generated files?
References: 1 2 3  Groups: php.internals 
Request: Send a blank email to internals+get-59196@lists.php.net to get a copy of this message
2012/3/28 Niel Archer <spam-free@blueyonder.co.uk> > > > git config --global core.autocrlf true > > Global option obviously makes this apply to all repoes, not sure how it > applies without it, as this is pretty much the only way to be able to > work interoperably with Visual Studio. Stas mail about autocrlf: http://www.mail-archive.com/internals@lists.php.net/msg57100.html > Also a small thing - gitfaq recommends git config core.autocrlf input, but > we have some files in win32 which do not work with this setting (at least > on my Mac). With regards, Alexander Moskaliov Irker@irker.net

« previous php.internals (#59196) next »