diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2010-08-01 22:34:50 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2010-08-01 22:42:34 +0400 |
| commit | eef99c6b19efbf1787792f19878ed518c99ac91d (patch) | |
| tree | 8a032fa924f59e0830dd5e6ee69ce0959b405e3a /.gitattributes | |
| parent | dd0874f5be35a67fb82907fc92425339d6d06b59 (diff) | |
Re-enable 'crlf' attributes on *.cs
This fixes EOL conversions flagged by git 1.7.1 core.autocrlf=true. At this
point, neither git 1.7.1 nor 1.7.2 show any automatic CRLF normalization.
I think we're ready for another experiment.
There seems to be a difference in the handling of mixed line-ending files
between git 1.7.2 and older versions, when core.autocrlf is set to true.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/.gitattributes b/.gitattributes index 9f803813ed2..9bce5208ff0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,13 +1,18 @@ -#*.c crlf -#*.h crlf -#*.cs crlf -#*.sh crlf +# ensure LF endings on all checkouts +configure.in crlf=input -#ChangeLog crlf -#*akefile* crlf -#*.sources crlf +# ensure native line endings on checkout +*.c crlf +*.h crlf +*.cs crlf +*.sh crlf -# don't do anything to line-endings. Let CRLFs go into the repo +.gitattributes crlf +ChangeLog crlf +*akefile* crlf +*.sources crlf + +# don't do anything to line-endings. Let CRLFs go into the repo, and CRLF on checkout *.bat -crlf *.sln -crlf *.*proj* -crlf |