| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'connect/10.1' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -0/+3 |
| |\ | |||||
| | * | Merge branch '10.1' of https://github.com/MariaDB/server into ob-10.1 | Olivier Bertrand | 2016-05-22 | 1 | -5/+5 |
| | |\ | |/ |/| | |||||
| | * | - Add the JdbcInterface.java to the project | Olivier Bertrand | 2016-04-27 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | added: storage/connect/JdbcInterface.java - Add *.java to be handled modified: .gitattributes | ||||
| | * | Commit resolved conflicts | Olivier Bertrand | 2015-09-18 | 1 | -0/+3 |
| | |\ | |/ |/| | |||||
| | * | Commit od last modifications made for version 10.0 | Olivier Bertrand | 2015-06-06 | 1 | -2/+4 |
| | | | |||||
| | * | Commit merge resolve | Olivier Bertrand | 2015-06-05 | 1 | -0/+1 |
| | |\ | |||||
| | | * | Update .gitattributes | Vicentiu Ciorbaru | 2015-05-08 | 1 | -0/+21 |
| | | | | |||||
| | * | | Make this repository aligned with 10.0 one | Olivier Bertrand | 2015-04-05 | 1 | -0/+20 |
| | |/ | |||||
| | * | git: ignore errmsg.sys and typescript, better diff header for C/C++ files | Sergei Golubchik | 2014-08-27 | 1 | -0/+5 |
| | | |||||
| * | .gitattributes: pcre/testdata/greppatN4 -text | Sergei Golubchik | 2015-08-01 | 1 | -0/+1 |
| | | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 1 | -1/+5 |
| |\ | |||||
| | * | Merge branch '5.5' into bb-5.5-serg | Sergei Golubchik | 2015-06-05 | 1 | -0/+3 |
| | |\ | |||||
| | | * | Some MYD files (e.g. in mysql-test/std_data) could erroneously be | Alexander Barkov | 2015-06-04 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | treated by git as text files. Marking all MyISAM files as binary in .gitattributes: (*.frm, *.MYD, *.MYI) | ||||
| | * | | .gitattributes: *.dat files should not be CRLF converted | Sergei Golubchik | 2015-06-03 | 1 | -0/+1 |
| | |/ | |||||
| | * | Update .gitattributes | Vicentiu Ciorbaru | 2015-05-08 | 1 | -2/+0 |
| | | | |||||
| | * | Updated .gitattributes | Vicentiu Ciorbaru | 2015-05-08 | 1 | -0/+21 |
| | | | |||||
| * | | update .gitattributes | Sergei Golubchik | 2015-05-08 | 1 | -4/+5 |
| | | | |||||
| * | | - Adding files to ignore from C C++ and Visual Studio | Olivier Bertrand | 2015-03-16 | 1 | -0/+20 |
| |/ | | | | - Making result files to be ended by LF to avoid test failures | ||||
| * | Fix the tree to work in git. Backport corresponing 10.1 changes. | Sergei Golubchik | 2015-02-10 | 1 | -0/+5 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |
path: root/.gitattributes