git: ignore errmsg.sys and typescript, better diff header for C/C++ f…

…iles
MariaDB · Aug 27, 2014 · f883f3e · f883f3e
1 parent 422b99e
commit f883f3e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,5 @@
+*.c     diff=cpp
+*.h     diff=cpp
+*.cc    diff=cpp
+*.ic    diff=cpp
+*.cpp   diff=cpp
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,8 @@
 *.ninja
 .ninja_*
 .gdb_history
+errmsg.sys
+typescript
 CMakeCache.txt
 CMakeFiles/
 CPackConfig.cmake
@@ -132,7 +134,6 @@ sql/gen_lex_hash
 sql/lex_hash.h
 sql/mysql_tzinfo_to_sql
 sql/mysqld
-sql/share/*/errmsg.sys
 sql/sql_builtin.cc
 sql/sql_yacc.cc
 sql/sql_yacc.h