update gitattributes

.gitattributes

@@ -1,3 +1,5 @@
+.git* text export-ignore
+
 # Set the default behavior, in case people don't have core.autocrlf set.
 * text=auto
 
@@ -12,6 +14,7 @@
 *.c text whitespace=tab-in-indent,trail,space
 *.h text whitespace=tab-in-indent,trail,space
 *.H text whitespace=tab-in-indent,trail,space
+*.cu text whitespace=tab-in-indent,trail,space
 *.java text whitespace=tab-in-indent,trail,space
 *.md text
 *.pro text whitespace=tab-in-indent,trail,space
@@ -20,11 +23,13 @@
 *.in text whitespace=tab-in-indent,trail,space
 CMakeLists.txt text whitespace=tab-in-indent,trail,space
 
+*.sh            eol=lf
+
 # Declare files that will always have CRLF line endings on checkout.
 # VS 20xx files
 *.sln text eol=crlf
-*.vcproj text eol=crlf
-*.vcxproj text eol=crlf
+*.vcproj text eol=crlf merge=union
+*.vcxproj text eol=crlf merge=union
 *.vcxproj.filters text eol=crlf
 # VC6 files
 *.dsw text eol=crlf
@@ -33,6 +38,7 @@ CMakeLists.txt text whitespace=tab-in-indent,trail,space
 # Other 'windows-specific' files
 *.bat text eol=crlf
 *.bat.in text eol=crlf
+*.cmd text eof=crlf
 
 # Denote all files that are truly binary and should not be modified.
 *.png binary