Skip to content

Commit

Permalink
saving files before refreshing lineendings
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesw committed Oct 23, 2014
1 parent 469510e commit d494947
Showing 1 changed file with 31 additions and 46 deletions.
77 changes: 31 additions & 46 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,49 +1,34 @@
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

*.jpg binary
*.png binary
*.gif binary
# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.cs text
*.md text
*.targets text
*.proj text
*.csproj text
*.sln text

*.cs text=auto diff=csharp
*.vb text=auto
*.c text=auto
*.cpp text=auto
*.cxx text=auto
*.h text=auto
*.hxx text=auto
*.py text=auto
*.rb text=auto
*.java text=auto
*.html text=auto
*.htm text=auto
*.css text=auto
*.scss text=auto
*.sass text=auto
*.less text=auto
*.js text=auto
*.lisp text=auto
*.clj text=auto
*.sql text=auto
*.php text=auto
*.lua text=auto
*.m text=auto
*.asm text=auto
*.erl text=auto
*.fs text=auto
*.fsx text=auto
*.hs text=auto
# Tesseract config files MUST use LF line endings
/src/Tesseract.Tests/tessdata/Configs/* eol=lf
*.user-words text eol=lf
*.user-words text eol=lf
*.cube.bigrams text eol=lf
*.cube.fold text eol=lf
*.cube.lm text eol=lf
*.cube.params text eol=lf
*.cube.size text eol=lf
*.cube.word-freq text eol=lf

*.csproj text=auto merge=union
*.vbproj text=auto merge=union
*.fsproj text=auto merge=union
*.dbproj text=auto merge=union
*.sln text=auto eol=crlf merge=union

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
*.tiff binary
*.tif binary
*.dll binary
*.exe binary
*.trainedata binary
*.cube.nn binary
*.tesseract_cube.nn binary

0 comments on commit d494947

Please sign in to comment.