Revise git attributes

.gitattributes

@@ -1,27 +1,36 @@
 .git*       export-ignore
 
-*           text=auto
+*           text=auto whitespace=trailing-space,space-before-tab,-indent-with-non-tab,tab-in-indent,tabwidth=4
-*           whitespace=!indent,trail,space
+
-
+*.py        text
-*.py        text whitespace=tab-in-indent,trail,space,fix
+*.cpp       text
-*.cpp       text whitespace=tab-in-indent,trail,space,fix
+*.hpp       text
-*.hpp       text whitespace=tab-in-indent,trail,space,fix
+*.cxx       text
-*.cxx       text whitespace=tab-in-indent,trail,space,fix
+*.hxx       text
-*.hxx       text whitespace=tab-in-indent,trail,space,fix
+*.mm        text
-*.mm        text whitespace=tab-in-indent,trail,space,fix
+*.c         text
-*.c         text whitespace=tab-in-indent,trail,space,fix
+*.h         text
-*.h         text whitespace=tab-in-indent,trail,space,fix
+*.i         text
-*.i         text whitespace=tab-in-indent,trail,space,fix
+*.js        text
-*.java      text whitespace=tab-in-indent,trail,space,fix
+*.java      text
-*.cu        text whitespace=tab-in-indent,trail,space,fix
+*.scala     text
-*.cl        text whitespace=tab-in-indent,trail,space,fix
+*.cu        text
-
+*.cl        text
-*.cmake     text whitespace=tab-in-indent,trail,space,fix
+*.css_t     text
-*.cmakein   text whitespace=tab-in-indent,trail,space,fix
+*.qrc       text
-*.in        text whitespace=tab-in-indent,trail,space,fix
+*.qss       text
-CMakeLists.txt  text whitespace=tab-in-indent,trail,space,fix
+*.S         text
-
+*.rst       text
-*.rst       text whitespace=tab-in-indent,trail,space,fix
+*.tex       text
+*.sty       text
+
+*.aidl      text
+*.mk        text
+
+*.cmake         text whitespace=tabwidth=2
+*.cmakein       text whitespace=tabwidth=2
+*.in            text whitespace=tabwidth=2
+CMakeLists.txt  text whitespace=tabwidth=2
 
 *.png       binary
 *.jepg      binary
@@ -32,22 +41,21 @@ CMakeLists.txt  text whitespace=tab-in-indent,trail,space,fix
 *.a         binary
 *.so        binary
 *.dll       binary
+*.jar       binary
 
 *.pdf       binary
 *.pbxproj   binary
 *.vec       binary
 *.doc       binary
 
-*.css_t     text
+*.xml                      -text whitespace=cr-at-eol
-*.qrc       text
+*.yml                      -text whitespace=cr-at-eol
-*.qss       text
+.project                   -text whitespace=cr-at-eol merge=union
-*.S         text
+.classpath                 -text whitespace=cr-at-eol merge=union
-
+.cproject                  -text whitespace=cr-at-eol merge=union
-*.xml       -text
+org.eclipse.jdt.core.prefs -text whitespace=cr-at-eol merge=union
-*.yml       -text
 
 *.vcproj    text eol=crlf merge=union
-*.cproject  text eol=crlf merge=union
 *.bat       text eol=crlf
 *.cmd       text eol=crlf
 *.cmd.tmpl  text eol=crlf