diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-08-12 14:05:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-08-27 21:25:06 +0200 |
| commit | f883f3ef868fb7471dafdd9b21f1f50ab98bda85 (patch) | |
| tree | b9f73758a921ab76ef552461677f1fbdf64ff3e8 | |
| parent | 422b99ed87cab7b6acdb86be0a8b424db1213af2 (diff) | |
| download | mariadb-git-f883f3ef868fb7471dafdd9b21f1f50ab98bda85.tar.gz | |
git: ignore errmsg.sys and typescript, better diff header for C/C++ files
| -rw-r--r-- | .gitattributes | 5 | ||||
| -rw-r--r-- | .gitignore | 3 |
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 |