Re: git merge and generated files?

From:	Pierre Joye	Date:	Wed, 28 Mar 2012 09:51:59 +0000
Subject:	Re: git merge and generated files?
References:	1 2 3	Groups:	php.internals
Request:	Send a blank email to [email protected] to get a copy of this message

Hi,


On Wed, Mar 28, 2012 at 11:48 AM, Niel Archer
<[email protected]> wrote:

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


Thanks for the headup about the new line thing, my mistake. Gustavo
fixed it too.

However it is not the topic of this thread :)

Cheers,
-- 
Pierre

@pierrejoye | http://blog.thepimp.net | http://www.libgd.org


   

Thread (9 messages)

• Pierre JoyeWed, 28 Mar 2012 00:14:40 +0000
  • Stas MalyshevWed, 28 Mar 2012 00:33:21 +0000
    • Pierre JoyeWed, 28 Mar 2012 00:38:04 +0000
      • Stas MalyshevWed, 28 Mar 2012 00:43:59 +0000
        • Kris CraigWed, 28 Mar 2012 00:54:00 +0000
          • Niel ArcherWed, 28 Mar 2012 09:48:51 +0000
            • Pierre JoyeWed, 28 Mar 2012 09:51:59 +0000
            • Alexander MoskaliovWed, 28 Mar 2012 10:17:59 +0000
        • Yasuo OhgakiWed, 28 Mar 2012 01:01:56 +0000