diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-28 22:12:50 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-28 22:12:50 +0200 |
| commit | 736f821c420954912464b9ae521acc5b768438cc (patch) | |
| tree | 6348f794bb3b1ec24d7064000b7ea6e941f9ec2c /.gitattributes | |
| parent | 62e0a4552f3b4a932f9aa055579dad716b371b9b (diff) | |
| parent | 7e64b079680b5f0f1e1cb735e3c83e45e96ec0e3 (diff) | |
| download | mariadb-git-736f821c420954912464b9ae521acc5b768438cc.tar.gz | |
Merge branch 'connect/10.1' into 10.1
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index b2e324795aa..852eec4d638 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ *.cpp text *.h text *.test text +*.java text # These files should be checked out as is *.result -text -whitespace @@ -23,9 +24,11 @@ pcre/testdata/greppatN4 -text *.frm binary *.MYD binary *.MYI binary +*.class binary *.c diff=cpp *.h diff=cpp *.cc diff=cpp *.ic diff=cpp *.cpp diff=cpp +*.java diff=cpp |