diff options
| author | VirtualTam <virtualtam@flibidi.net> | 2016-01-02 19:19:16 +0100 |
|---|---|---|
| committer | VirtualTam <virtualtam@flibidi.net> | 2016-01-02 19:19:16 +0100 |
| commit | 66d86ea521d737b1bc92b16b9c9b4126f545916c (patch) | |
| tree | e74568a125834e977725fe992f458e7739d2c57a /.gitattributes | |
| parent | 0baf7842fc0cf4cbd5ca2b8c5ae6dc7a59c07700 (diff) | |
| parent | 453f4653c325dc23193e16432170bf634c42e8a2 (diff) | |
| download | Shaarli-66d86ea521d737b1bc92b16b9c9b4126f545916c.tar.gz Shaarli-66d86ea521d737b1bc92b16b9c9b4126f545916c.tar.zst Shaarli-66d86ea521d737b1bc92b16b9c9b4126f545916c.zip | |
Merge pull request #423 from virtualtam/docker
Docker: move Dockerfiles to the main repository
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index e616be28..aaf6a39e 100644 --- a/.gitattributes +++ b/.gitattributes | |||
| @@ -2,11 +2,13 @@ | |||
| 2 | * text=auto eol=lf | 2 | * text=auto eol=lf |
| 3 | 3 | ||
| 4 | # Ensure sources are processed | 4 | # Ensure sources are processed |
| 5 | *.conf text | ||
| 5 | *.css text | 6 | *.css text |
| 6 | *.html text diff=html | 7 | *.html text diff=html |
| 7 | *.js text | 8 | *.js text |
| 8 | *.md text | 9 | *.md text |
| 9 | *.php text diff=php | 10 | *.php text diff=php |
| 11 | Dockerfile text | ||
| 10 | 12 | ||
| 11 | # Do not alter images nor minified scripts | 13 | # Do not alter images nor minified scripts |
| 12 | *.ico binary | 14 | *.ico binary |
| @@ -22,6 +24,7 @@ | |||
| 22 | composer.json export-ignore | 24 | composer.json export-ignore |
| 23 | doc/**/*.json export-ignore | 25 | doc/**/*.json export-ignore |
| 24 | doc/**/*.md export-ignore | 26 | doc/**/*.md export-ignore |
| 27 | docker/ export-ignore | ||
| 25 | Doxyfile export-ignore | 28 | Doxyfile export-ignore |
| 26 | Makefile export-ignore | 29 | Makefile export-ignore |
| 27 | phpunit.xml export-ignore | 30 | phpunit.xml export-ignore |