summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2018-05-051-0/+1
|\
| * Squashed commit of connect/10.0:Sergei Golubchik2018-04-261-0/+1
* | Merge branch 'connect/10.1' into 10.1Sergei Golubchik2016-06-281-0/+3
|\ \ | |/ |/|
| * Merge branch '10.1' of https://github.com/MariaDB/server into ob-10.1Olivier Bertrand2016-05-221-5/+5
| |\ | |/ |/|
| * - Add the JdbcInterface.java to the projectOlivier Bertrand2016-04-271-0/+2
| * Commit resolved conflictsOlivier Bertrand2015-09-181-0/+3
| |\ | |/ |/|
| * Commit od last modifications made for version 10.0Olivier Bertrand2015-06-061-2/+4
| * Commit merge resolveOlivier Bertrand2015-06-051-0/+1
| |\
| | * Update .gitattributesVicentiu Ciorbaru2015-05-081-0/+21
| * | Make this repository aligned with 10.0 oneOlivier Bertrand2015-04-051-0/+20
| |/
| * git: ignore errmsg.sys and typescript, better diff header for C/C++ filesSergei Golubchik2014-08-271-0/+5
* .gitattributes: pcre/testdata/greppatN4 -textSergei Golubchik2015-08-011-0/+1
* Merge branch '5.5' into 10.0Sergei Golubchik2015-06-111-1/+5
|\
| * Merge branch '5.5' into bb-5.5-sergSergei Golubchik2015-06-051-0/+3
| |\
| | * Some MYD files (e.g. in mysql-test/std_data) could erroneously beAlexander Barkov2015-06-041-0/+3
| * | .gitattributes: *.dat files should not be CRLF convertedSergei Golubchik2015-06-031-0/+1
| |/
| * Update .gitattributesVicentiu Ciorbaru2015-05-081-2/+0
| * Updated .gitattributesVicentiu Ciorbaru2015-05-081-0/+21
* | update .gitattributesSergei Golubchik2015-05-081-4/+5
* | - Adding files to ignore from C C++ and Visual StudioOlivier Bertrand2015-03-161-0/+20
|/
* Fix the tree to work in git. Backport corresponing 10.1 changes.Sergei Golubchik2015-02-101-0/+5