diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2010-07-25 07:41:26 +0400 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2010-07-25 07:41:26 +0400 |
| commit | 65129e63c863c452c569c0d26c295f2b2cf18e9d (patch) | |
| tree | ee828249e9fb0a977e17e789ad6eeb7c37285e15 /.gitattributes | |
| parent | d9601125f3e0df1d16990c92e24a9ac1f47d3dcd (diff) | |
First stab at gitattributes to keep stuff clean when autocrlf is enabled on Windows
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..1bac78f5ca --- /dev/null +++ b/.gitattributes @@ -0,0 +1,36 @@ +# NOTE: this file is for git 1.6.6 (and possibly older) +# Post-1.7.2 there is eol and text, and crlf is deprecated +# but we can't depend on an unreleased version... + +# This file mainly controls line ending conversion behaviour, if +# the user has the setting core.autocrlf true. + +# The meaning of the attributes is a little odd +# -crlf means DO NOT convert line endings +# crlf means CONVERT to lf in the repo & Linux/Mac, crlf on Windows + +# First, turn off git line ending handling except on a case-by-case basis +# because our repo isn't normalized, in general. +# There are even files with mixed line endings. +* -crlf + +# sln is always CRLF, even on linux, so don't convert +*.sln -crlf + +# These files can be converted, since they're new +.gitattributes crlf +.gitignore crlf + +# Having proj files as crlf on windows will make VS happier +# MD can deal with (and preserve) either. +*proj crlf + +# Stetic files are always generated using native line endings, so need to be converted +# Sadly, git has useless path globs +*/*/gtk-gui/* crlf +*/*/*/gtk-gui/* crlf +*/*/*/*/gtk-gui/* crlf +*/*/*/*/*/gtk-gui/* crlf +*/*/*/*/*/*/gtk-gui/* crlf +*/*/*/*/*/*/*/gtk-gui/* crlf +*/*/*/*/*/*/*/*/gtk-gui/* crlf |