summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore31
1 files changed, 30 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 714a294..5f1e7e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+@@ -1,227 +1,26 @@
#################
## Eclipse
#################
@@ -224,4 +225,32 @@ pip-log.txt
.lss
.map
.o
-.srec \ No newline at end of file
+.srec
+ No newline at end of file
+# 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
+*.cproj merge=union
+*.c diff=c
+
+
+
+# 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
+