Skip to content

Commit 1a1de19

Browse files
jspahrsummersjspahrsummers
committed
Merge remote-tracking branch 'origin/master' into pr/506
Conflicts: Yii.gitignore
2 parents 407664c + 8335a5d commit 1a1de19

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+515
-408
lines changed

‎Actionscript.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ bin-release/
88

99
# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
1010
# should NOT be excluded as they contain compiler settings and other important
11-
# information for Eclipse / Flash Builder.
11+
# information for Eclipse / Flash Builder.

‎Android.gitignore

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,3 @@ local.properties
2121

2222
# Proguard folder generated by Eclipse
2323
proguard/
24-
25-
# Intellij project files
26-
*.iml
27-
*.ipr
28-
*.iws
29-
.idea/
30-

‎C++.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,20 @@
22
*.slo
33
*.lo
44
*.o
5+
*.obj
56

67
# Compiled Dynamic libraries
78
*.so
89
*.dylib
10+
*.dll
911

1012
# Compiled Static libraries
1113
*.lai
1214
*.la
1315
*.a
16+
*.lib
17+
18+
# Executables
19+
*.exe
20+
*.out
21+
*.app

‎C.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Object files
22
*.o
3+
*.ko
4+
*.obj
5+
*.elf
36

47
# Libraries
58
*.lib
@@ -15,3 +18,4 @@
1518
*.exe
1619
*.out
1720
*.app
21+
*.hex

‎CONTRIBUTING.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Contributing guidelines
2+
3+
We’d love you to help us improve this project. To help us keep this collection
4+
high quality, we request that contributions adhere to the following guidelines.
5+
6+
- **Provide a link to the application or project’s homepage**. Unless it’s
7+
extremely popular, there’s a chance the maintainers don’t know about or use
8+
the language, framework, editor, app, or project your change applies to.
9+
10+
- **Provide links to documentation** supporting the change you’re making.
11+
Current, canonical documentation mentioning the files being ignored is best.
12+
If documentation isn’t available to support your change, do the best you can
13+
to explain what the files being ignored are for.
14+
15+
- **Explain why you’re making a change**. Even if it seems self-evident, please
16+
take a sentence or two to tell us why your change or addition should happen.
17+
It’s especially helpful to articulate why this change applies to *everyone*
18+
who works with the applicable technology, rather than just you or your team.
19+
20+
- **Please consider the scope of your change**. If your change specific to a
21+
certain language or framework, then make sure the change is made to the
22+
template for that language or framework, rather than to the template for an
23+
editor, tool, or operating system.
24+
25+
- **Please only modify *one template* per pull request**. This helps keep pull
26+
requests and feedback focused on a specific project or technology.
27+
28+
In general, the more you can do to help us understand the change you’re making,
29+
the more likely we’ll be to accept your contribution quickly.
30+
31+
Please also understand that we can’t list every tool that ever existed.
32+
Our aim is to curate a collection of the *most common and helpful* templates,
33+
not to make sure we cover every project possible. If we choose not to
34+
include your language, tool, or project, it’s not because it’s not awesome.

‎CakePHP.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ tmp/*
44
app/tmp/*
55
app/[Cc]onfig/core.php
66
app/[Cc]onfig/database.php
7-
!empty
7+
!empty

‎Composer.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
composer.phar
2+
vendor/
3+
4+
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
5+
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
6+
# composer.lock

‎Concrete5.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
config/site.php
22
files/cache/*
3-
files/tmp/*
3+
files/tmp/*

‎Coq.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
*.vo
22
*.glob
33
*.v.d
4-

‎Dart.gitignore

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
.DS_Store
2-
packages
1+
// Don’t commit the following files and directories created by pub, Dart Editor, and dart2js
2+
packages/
33
.project
4-
pubspec.lock
4+
.buildlog
5+
*.js_
6+
*.js.deps
7+
*.js.map
8+
9+
// Include when developing application packages
10+
pubspec.lock
11+
12+
// Avoid committing generated JavaScript files
13+
*.dart.js
14+
15+
// Check for any other incovenient files generated by OS
16+
// and other tools such as Eclipse, IntelliJ, etc.

‎Delphi.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ __history
77
*.map
88
*.exe
99
*.dll
10-
bin/*
10+
bin/*

‎Drupal.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ xmlrpc.php
3434
/modules
3535
/profiles
3636
/scripts
37-
/themes
37+
/themes

‎EPiServer.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
######################
2+
## EPiServer Files
3+
######################
4+
*License.config

‎Erlang.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
deps
33
*.o
44
*.beam
5-
*.plt
5+
*.plt
6+
erl_crash.dump

‎ExpressionEngine.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@ images/member_photos/
88
images/signature_attachments/
99
images/pm_attachments/
1010

11+
# For security do not publish the following files
12+
system/expressionengine/config/database.php
13+
system/expressionengine/config/config.php
14+
1115
# Caches
1216
sized/
1317
thumbs/
1418
_thumbs/
15-
*/expressionengine/cache/*
19+
*/expressionengine/cache/*

‎Fancy.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.rbc
2+
*.fyc

‎Finale.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@
1111
# Some versions of Finale have a bug and randomly save extra copies of
1212
# the music source as "<Filename> copy.mus"
1313
*copy.mus
14-

‎ForceDotCom.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.project
22
.settings
33
salesforce.schema
4-
Referenced Packages
4+
Referenced Packages

‎GWT.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@ gwt-unitCache/
1414
# more caches and things from deploy #
1515
war/WEB-INF/deploy/
1616
war/WEB-INF/classes/
17-

‎Global/Archives.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*.bz2
1010
*.xz
1111
*.lzma
12+
*.cab
1213

1314
#packing-only formats
1415
*.iso
@@ -21,3 +22,6 @@
2122
*.egg
2223
*.deb
2324
*.rpm
25+
*.msi
26+
*.msm
27+
*.msp

‎Global/CVS.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/CVS/*
22
*/CVS/*
33
.cvsignore
4-
*/.cvsignore
4+
*/.cvsignore

‎Global/Eclipse.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
*.pydevproject
2-
.project
32
.metadata
3+
.gradle
44
bin/**
55
tmp/**
66
tmp/**/*
@@ -9,7 +9,6 @@ tmp/**/*
99
*.swp
1010
*~.nib
1111
local.properties
12-
.classpath
1312
.settings/
1413
.loadpath
1514

@@ -24,3 +23,6 @@ local.properties
2423

2524
# PDT-specific
2625
.buildpath
26+
27+
# TeXlipse plugin
28+
.texlipse

‎Global/Espresso.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
*.esproj
1+
*.esproj

‎Global/FlexBuilder.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
bin/
2-
bin-debug/
2+
bin-debug/

‎Global/IntelliJ.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎Global/JetBrains.gitignore

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode
2+
3+
## Directory-based project format
4+
.idea/
5+
# if you remove the above rule, at least ignore user-specific stuff:
6+
# .idea/workspace.xml
7+
# .idea/tasks.xml
8+
# and these sensitive or high-churn files:
9+
# .idea/dataSources.ids
10+
# .idea/dataSources.xml
11+
# .idea/sqlDataSources.xml
12+
# .idea/dynamic.xml
13+
14+
## File-based project format
15+
*.ipr
16+
*.iws
17+
*.iml
18+
19+
## Additional for IntelliJ
20+
out/

‎Global/KDevelop4.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.kdev4
2+
.kdev4/

‎Global/Linux.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
.*
2-
!.gitignore
31
*~

‎Global/Matlab.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
# Compiled MEX binaries (all platforms)
1313
*.mex*
1414

15-
# Simulink Code Generation
15+
# Simulink Code Generation
1616
slprj/

‎Global/NotepadPP.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Notepad++ backups #
2+
*.bak

‎Global/OSX.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
.DS_Store
22
.AppleDouble
33
.LSOverride
4-
Icon
54

5+
# Icon must ends with two \r.
6+
Icon
67

78
# Thumbnails
89
._*

‎Global/PhPStorm.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Global/PyCharm.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎Global/RubyMine.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Global/SASS.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
### SASS Ignores - "Sassy CSS" http://sass-lang.com/
1+
### Sass Ignores - "Sassy CSS" http://sass-lang.com/
22
*.sass-cache

‎Global/SBT.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44
target/
55
lib_managed/
66
src_managed/
7-
project/boot/
7+
project/boot/
8+
.history
9+
.cache

‎Global/SublimeText.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1-
# SublimeText project files
1+
# workspace files are user-specific
22
*.sublime-workspace
3+
4+
# project files should be checked into the repository, unless a significant
5+
# proportion of contributors will probably not be using SublimeText
6+
# *.sublime-project

‎Global/Tags.gitignore

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
# Ignore tags created by etags and ctags
1+
# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
22
TAGS
33
!TAGS/
44
tags
55
!tags/
6+
gtags.files
7+
GTAGS
8+
GRTAGS
9+
GPATH
10+
cscope.files
11+
cscope.out
12+
cscope.in.out
13+
cscope.po.out
14+

‎Global/Vagrant.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.vagrant/

0 commit comments

Comments
 (0)