Hi,

On Mon, 27 Aug 2007, Dmitry Kakurin wrote:

quoted text
> Here is the problem: we need to apply crlf attributes to a file. We
> could have .gitattributes both in the index and in the worktree.
> Which one do we use?
> In general .gitattributes file could be (U)nchanged, (C)hanged, (NP)
> NotPresent in each place.

I do not see these cases.  You can have these cases, basically:

- .gitattributes in worktree (then it does not matter what else we have),
- .gitattributes not in the worktree, but in the index (then that is taken)

In the latter case, there could be conflicts _in_ .gitattributes, in which 
case those .gitattributes are ignored.

I do not see any problem with that.

quoted text
> This gives us 3x3 matrix = 9 special cases to handle.

It would be 2x3, not 3x3.

Ciao,
Dscho

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html