summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes5
-rw-r--r--.gitignore3
2 files changed, 7 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..cdfedef671f
--- /dev/null
+++ 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
index 3a3733470fc..24d82cb758c 100644
--- 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