Skip to content

Commit

Permalink
*minor updates to include more
Browse files Browse the repository at this point in the history
more attributes to track as suggested by github. project specific files
to be ignored.
  • Loading branch information
cherihung committed Jun 22, 2013
1 parent c44ea56 commit d1ae631
Show file tree
Hide file tree
Showing 3 changed files with 950 additions and 923 deletions.
22 changes: 22 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.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
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
.DS_Store
.sass-cache
.sass-cache

# Project Files
mixture.json
*.komodoproject
tmp/
Loading

0 comments on commit d1ae631

Please sign in to comment.