1
0
mirror of https://github.com/gitattributes/gitattributes.git synced 2025-01-22 08:18:50 -05:00
Commit Graph

333 Commits

Author SHA1 Message Date
Alexander Karatarakis
e8991bf276 Merge pull request #37 from yixinglu/master
fix typo for c language source file
2016-01-19 21:41:01 -08:00
Yi Xinglu
fd5b9f844f fix typo for c language source file 2016-01-20 09:26:55 +08:00
Alexander Karatarakis
5fc1560bb4 Merge pull request #35 from HoBi/patch-2
Add additional entries in web gitattributes
2015-12-15 17:04:26 -08:00
Honza Bittner
31b1bcb929 Add web gitattributes
- *.ts - TypeScript (superset of Javascript) 
- *.latte - Nette template system.
- *.woff2 - file for font
2015-12-14 22:33:49 +01:00
Alexander Karatarakis
c3c4e75fc6 Merge pull request #34 from compumike08/master
Change svg from text to binary in Common.gitattributes file
2015-12-13 21:54:58 -08:00
compumike08
6e33907e57 Change svg from text to binary
Change the *.svg file pattern from 'text' type to 'binary' type.
2015-12-11 21:44:35 -05:00
Alexander Karatarakis
559993f7db Merge pull request #32 from mrogaski/master
Added attribute file for Lua.
2015-12-03 10:06:50 -08:00
Alexander Karatarakis
0c4c5e1abd Merge pull request #33 from scottclowe/master
Remove inline comments
2015-12-03 10:03:30 -08:00
Scott Lowe
d2539f6102 Remove inline comments
Git does not actually support inline comments within
.gitattributes and complains that # is not a valid attribute name.
2015-12-03 17:47:29 +00:00
Mark Rogaski
cf5db69702 Added attribute file for Lua. 2015-12-03 11:43:23 -05:00
Alexander Karatarakis
c3833a528b Remove merge=union. Resolves #21 2015-11-23 11:47:12 -08:00
Alexander Karatarakis
777d627207 Update VisualStudio.gitattributes
Visual Studio 2015 additions
2015-11-23 11:44:19 -08:00
Alexander Karatarakis
1bfc4acb78 Fix and generalize md entry in .gitattributes
Previous entry was not proper. Also, *.md handles README.md as well and not just LICENSE.md
2015-11-01 20:51:19 -08:00
Alexander Karatarakis
c736e31bae Add LICENSE.md to .gitattributes 2015-11-01 20:47:49 -08:00
Alexander Karatarakis
d1a8a56ad5 Create LICENSE.md
Add MIT license

(The gitignore repo also uses the MIT license)
2015-11-01 20:36:42 -08:00
Alexander Karatarakis
5aef181069 Merge pull request #29 from scottclowe/common-images
Add more image extensions to Common.gitattributes
2015-09-09 15:29:13 +03:00
Alexander Karatarakis
4d8b7a5734 Merge pull request #28 from scottclowe/add-matlab
Create Matlab.gitattributes
2015-09-09 15:22:34 +03:00
Scott Lowe
4913e5c68a Create Matlab.gitattributes
Ensure *.m and *.mu files containing MATLAB or MuPad code are
recognised as text files, and all other MathWorks proprietary
compiled file types are recognised as binaries. These includes
MATLAB, Simulink, and MuPAD file extensions.

Sources:
https://uk.mathworks.com/help/matlab/matlab_prog/set-up-git-source-control.html
https://uk.mathworks.com/help/matlab/matlab_env/mathworks-file-extensions.html
2015-09-08 23:51:52 +01:00
Scott Lowe
f4cea8743b Add more image extensions to Common.gitattributes
Add the following extensions and set them to binary:
*.tif and *.tiff for TIFF files
*.eps for EPS files
As a vector graphics format, EPS files are written in text, but are
not really human-parsable, unlike SVG files. For this reason, I have
set them to binary. They certainly do not want to have EOL correction
applied, so they need `-text`, and I don't think humans will typically
be interested in their diff, so `-diff`, hence `binary` will suffice.
2015-09-08 23:36:01 +01:00
Alexander Karatarakis
3552e42923 Merge pull request #27 from johnpeach/master
Added attributes for perl
2015-08-29 14:12:18 +03:00
John Peach
80aacc1478 Added attributes for R 2015-08-21 21:46:05 -07:00
John Peach
07a4b3620e Added attributes for perl 2015-08-21 21:24:51 -07:00
Alexander Karatarakis
2036fcfca1 Merge pull request #26 from HoBi/patch-1
Added .gitconfig to web.
2015-08-06 07:47:28 +03:00
Honza Bittner
5b73b0a93d Added .gitconfig to web. 2015-07-24 01:16:17 +02:00
Alexander Karatarakis
cd08452f86 Merge pull request #25 from spasmsaps/master
add eot, woff and svg to web template
2015-04-28 02:52:25 +03:00
Alexander Karatarakis
4ffc181d39 Merge pull request #24 from arbaaz/ejs_template
added ejs in template
2015-04-28 02:36:38 +03:00
spasmsaps
70221e24b4 add eot, woff and svg to web template 2015-04-26 22:33:42 +00:00
Arbaaz
74af03ba7c added ejs in template 2015-04-23 16:34:07 +05:30
Alexander Karatarakis
9f7784446f Merge pull request #22 from hobi/master
Added endings CSS preprocessors, CoffeeScript and .phtml.
2015-03-28 14:07:07 +02:00
Honza Bittner
ed90f463fb Added endings for .sass, .scss, .less, .styl (CSS preprocessors), .coffee (CoffeeScript) and .phtml. 2015-03-25 17:41:24 +01:00
Alexander Karatarakis
00e8820439 Merge pull request #20 from SgtPooki/patch-2
Web.gitattributes: treat pdf as binary
2015-02-22 23:35:58 +02:00
Russell Dempsey
9b4724544c gitattributes recognizes pdfs as binary
Honestly, PDFs should not be in the repo.. but if they are 
put in there, they should not be fiddled with.
2015-02-19 11:19:40 -06:00
Alexander Karatarakis
8f66cf89d2 Merge pull request #19 from SgtPooki/patch-1
Update Web.attributes
2015-02-15 20:12:03 +02:00
Russell Dempsey
219f25a8cb Update Web.attributes
Included files commonly included in web projects such as markdown 
files, gitignore and gitattribute files, jshint and other analysis config 
files, yaml, .editorconfig,  and heroku files
2015-02-12 17:20:28 -06:00
Alexander Karatarakis
6de1b0b544 Remove some duplicates between Common and Java/Web gitattributes
Signed-off-by: Alexander Karatarakis <alex@karatarakis.com>
2015-01-13 23:59:43 +02:00
Alexander Karatarakis
277a279066 Merge pull request #17 from Michaelfonzolo/master
Created Python.gitattributes
2015-01-13 23:21:31 +02:00
Alexander Karatarakis
ad941e0677 Merge pull request #16 from Michaelfonzolo/patch-1
Remove diplicate *.sql entry from Java.gitattributes
2015-01-13 23:19:52 +02:00
Michael Ala
71a401ac5b Created Python.gitattributes 2015-01-12 01:21:47 -05:00
Michael Ala
0ca5e983d3 Update Java.gitattributes
Removed duplicate *.sql entry
2015-01-11 23:44:03 -05:00
Alexander Karatarakis
afcd7c412d Merge pull request #15 from luxe/patch-1
Create C++.gitattributes
2015-01-03 22:02:58 +02:00
Trevor Hickey
4d094825d3 Create C++.gitattributes
".out" is debatable, but keep in mind that most compilers creat binaries of "a.out" by default
2015-01-01 01:13:48 -05:00
Alexander Karatarakis
3638885004 Merge pull request #14 from BrandyMint/rails
add Rails.gitattributes
2014-12-09 20:29:15 +02:00
Danil Pismenny
65ea00bee8 add Rails.gitattributes 2014-12-05 14:42:05 +04:00
Alexander Karatarakis
348e79e5c5 Merge pull request #13 from ceefour/master
Additional files
2014-10-10 00:53:57 +03:00
Hendy Irawan
1734fcc0c9
Additional files
Additional files
2014-08-01 00:27:45 +07:00
Alexander Karatarakis
e9c4312cab Separate VisualStudio.gitattributes from CSharp.gitattributes
Signed-off-by: Alexander Karatarakis <alex@karatarakis.com>
2014-05-17 17:56:21 +03:00
Alexander Karatarakis
4228f049f7 Merge pull request #12 from bbodenmiller/patch-2
make *.sln always text and use crlf line endings
2014-05-17 17:45:24 +03:00
Alexander Karatarakis
99042dcf18 Merge Graphics.gitattributes into Common.gitattributes
Signed-off-by: Alexander Karatarakis <alex@karatarakis.com>
2014-05-17 17:43:32 +03:00
Alexander Karatarakis
fa87f4624f Merge pull request #11 from bbodenmiller/patch-1
Create Graphics.gitattributes
2014-05-17 17:42:52 +03:00
Alexander Karatarakis
9d9d07e91c Merge pull request #10 from theyeag/patch-1
Add ear as binary
2014-05-17 17:39:29 +03:00