On Wed, Jan 28, 2009 at 04:25:37PM +0100, Kristian Amlie wrote: > However, if the .gitattributes file is also checked in to the branch, it > will not always be honored. I browsed the code a bit, and it seems to > happen whenever there is an existing .gitattributes file, but the > checkout adds new files to it. These new files will not get the correct > line endings (although I'm not sure if it happens *every* time, it could > depend on the order they are checked out). This is a known limitation of gitattributes. There has been some discussion in the past on how it should work, but I don't recall the specifics; try searching the list archive. I think it is really just waiting for somebody to step up and write some patches. As a workaround, you might be able to do something like: branch=master git show $branch:.gitattributes >.git/info/attributes git checkout $branch which is very hacky, but might work depending on your setup. Notably it will overwrite any actual use you were making of .git/info/attributes, and it will not respect any .gitattributes files in subdirectories. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html