From: Brian Gernhardt <benji@silverinsanity.com>
Date: Wed, 21 Feb 2007 16:57:06 GMT
Subject: Re: Unresolved issues
Message-ID: <09D527A1-43E2-41A1-AC46-71F64BC409C2@silverinsanity.com>
In-Reply-To: <Pine.LNX.4.63.0702211348060.22628@wbgn013.biozentrum.uni-wuerzburg.de>


On Feb 21, 2007, at 7:55 AM, Johannes Schindelin wrote:

> What you conveniently "forgot" to quote was the case: if we want  
> this to
> decide on when to use crlf<->lf transformation, we should decide that
> locally.

It seems to me that a tracked .gitattributes file should have things  
like

*.txt: text
*.gif: binary
*.[ch]: text

And the .git/config should have

[attribute "text"]
    mangle = crlf

[attribute "binary"]
    merge = none

The type of each file should be tracked, but what to do with each  
type is a local issue.  Trying to merge the two is madness.

~~ Brian