Skip to content

Commit 83656ad

Browse files
toananttoanant
committed
Merge branch 'master' of github.com:github/gitignore into patch-1
Conflicts: Python.gitignore
2 parents a623e9e + 028ed4e commit 83656ad

25 files changed

Lines changed: 143 additions & 47 deletions

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
**Reasons for making this change:**
2+
3+
_TODO_
4+
5+
**Links to documentation supporting these rule changes:**
6+
7+
_TODO_
8+
9+
If this is a new template:
10+
11+
- **Link to application or project’s homepage**: _TODO_

‎CakePHP.gitignore‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,20 @@
22

33
/vendor/*
44
/config/app.php
5-
/tmp/*
5+
6+
/tmp/cache/models/*
7+
!/tmp/cache/models/empty
8+
/tmp/cache/persistent/*
9+
!/tmp/cache/persistent/empty
10+
/tmp/cache/views/*
11+
!/tmp/cache/views/empty
12+
/tmp/sessions/*
13+
!/tmp/sessions/empty
14+
/tmp/tests/*
15+
!/tmp/tests/empty
16+
617
/logs/*
18+
!/logs/empty
719

820
# CakePHP 2
921

‎Concrete5.gitignore‎

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

‎FuelPHP.gitignore‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,21 @@
1-
fuel/app/logs/*/*/*
2-
fuel/app/cache/*/*
1+
# the composer package lock file and install directory
2+
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
3+
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
4+
# /composer.lock
5+
/fuel/vendor
6+
7+
# the fuelphp document
8+
/docs/
9+
10+
# you may install these packages with `oil package`.
11+
# http://fuelphp.com/docs/packages/oil/package.html
12+
# /fuel/packages/auth/
13+
# /fuel/packages/email/
14+
# /fuel/packages/oil/
15+
# /fuel/packages/orm/
16+
# /fuel/packages/parser/
17+
18+
# dynamically generated files
19+
/fuel/app/logs/*/*/*
20+
/fuel/app/cache/*/*
21+
/fuel/app/config/crypt.php

‎Global/CVS.gitignore‎

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

‎Global/Dreamweaver.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
# DW Dreamweaver added files
22
_notes
3+
_compareTemp
4+
configs/
35
dwsync.xml
6+
dw_php_codehinting.config
7+
*.mno

‎Global/Dropbox.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Dropbox settings and caches
2+
.dropbox
3+
.dropbox.attr
4+
.dropbox.cache

‎Global/Eclipse.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ tmp/
99
local.properties
1010
.settings/
1111
.loadpath
12+
.recommenders
1213

1314
# Eclipse Core
1415
.project

‎Global/Emacs.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,6 @@ flycheck_*.el
3636

3737
# server auth directory
3838
/server/
39+
40+
# projectiles files
41+
.projectile

‎Global/JetBrains.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# Sensitive or high-churn files:
1212
.idea/dataSources.ids
1313
.idea/dataSources.xml
14+
.idea/dataSources.local.xml
1415
.idea/sqlDataSources.xml
1516
.idea/dynamic.xml
1617
.idea/uiDesigner.xml

0 commit comments

Comments
 (0)