Merge branch 'master' of github.com:github/gitignore into patch-1
Conflicts:
Python.gitignore
Description
Description
Details
Details
- Committed
Abhishek Kumar Singh <abhishek4bhopati@gmail.com> Mar 7 2016, 07:21 - Pushed
aubort Jul 2 2018, 16:12 - Parents
- rGITIGNORE028ed4e1b12b: Merge pull request #1452 from nunorafaelrocha/enhancement/add-spool-folder
rGITIGNOREa623e9e6d4a5: Update Python.gitignore for celery-beat schedule binary file. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 028ed4e1b12b | Brendan Forster | Merge pull request #1452 from nunorafaelrocha/enhancement/add-spool-folder | Mar 6 2016 | |||
| 8e7920ac1c17 | Brendan Forster | Merge pull request #1892 from hippo91/master | Mar 6 2016 | |||
| 615b18d378d8 | Brendan Forster | Merge pull request #1811 from Caerbannog/master | Mar 6 2016 | |||
| 4db34a4cb9d2 | Martin d'Allens | Remove OSX specific rule | Mar 6 2016 | |||
| 17a0db246681 | Martin d'Allens/Martin d'Allens | KiCAD: ignore more temp files and generated data | Mar 6 2016 | |||
| 49a480951e18 | hippo91 | No need to push .spyderproject file in a python project | Mar 6 2016 | |||
| fed72cc405cd | Brendan Forster | Merge pull request #1764 from psantos10/patch-1 | Mar 6 2016 | |||
| 16a9e9bf8ad9 | Brendan Forster | Merge pull request #1550 from photodude/patch-1 | Mar 6 2016 | |||
| f6fb77ef8ee6 | Brendan Forster | Merge pull request #1781 from mkutyba/master | Mar 6 2016 | |||
| b7c949a108ee | Brendan Forster | Merge pull request #1707 from jeanCarloMachado/master | Mar 6 2016 | |||
| 340fcf1e1362 | Brendan Forster | Merge pull request #1736 from maidmaid/prestashop-cache | Mar 6 2016 | |||
| 363632ae6559 | Brendan Forster | Merge pull request #1655 from sourcerer-mike/develop-WordPress | Mar 6 2016 | |||
| 4596d11577ed | Brendan Forster | Merge pull request #1684 from jimhester/patch-1 | Mar 6 2016 | |||
| c3f81054bc13 | Brendan Forster | Merge pull request #1664 from littleibex/master | Mar 6 2016 | |||
| bd11089247e1 | Brendan Forster | Merge pull request #1624 from wikibootup/master | Mar 6 2016 | |||
| b35f448d6404 | Brendan Forster | Merge pull request #1623 from sorabito/feature/Added_Smalltalk_gitignore | Mar 6 2016 | |||
| 83dc73e5467a | Brendan Forster | Merge pull request #1598 from rdalkire/patch-1 | Mar 6 2016 | |||
| bb217159e61f | Brendan Forster | Merge pull request #1543 from barraponto/patch-2 | Mar 6 2016 | |||
| f25321570ebf | Brendan Forster | Merge pull request #1310 from kechol/fuelphp | Mar 6 2016 | |||
| 988fd7a3d2dd | Brendan Forster | Merge pull request #1807 from rlee287/eclipse-recommender | Mar 6 2016 | |||
| 9e636ea96f23 | Brendan Forster | Merge pull request #1867 from yoLotus/emacs-projectile | Mar 6 2016 | |||
| c6a8c5299d3c | Brendan Forster | Merge pull request #1559 from tjrana/dropbox-gitignore | Mar 6 2016 | |||
| 8411714b3183 | Brendan Forster | Merge pull request #1889 from aholmes/master | Mar 4 2016 | |||
| b2bacc518402 | Aaron Holmes | Remote ApplicationInsights.config from VisualStudio.gitignore | Mar 4 2016 | |||
| 1c70d149b55c | Brendan Forster | Merge pull request #1885 from roll/patch-1 | Feb 28 2016 | |||
| b37d30f19455 | roll | added dotenv to python gitignore | Feb 28 2016 | |||
| 04e2448f8f2b | Brendan Forster | Merge pull request #1882 from aaroncaito/terraform | Feb 27 2016 | |||
| e908f92f4b6b | Brendan Forster | Merge pull request #1883 from github/shiftkey-patch-1 | Feb 27 2016 | |||
| 9b890f90e9ce | Brendan Forster | adding a template to help streamline review process | Feb 27 2016 | |||
| 221f974e8081 | aaron caito | adding terraform state files | Feb 26 2016 | |||
| 0f4561614181 | Brendan Forster | Merge pull request #1686 from czechboy0/keep-scm-files | Feb 26 2016 | |||
| 272913dd9d4c | Honza Dvorsky | Merge branch 'master' of github.com:github/gitignore into keep-scm-files | Feb 26 2016 | |||
| c4ff566a309c | Brendan Forster | Merge pull request #1871 from guenti/master | Feb 25 2016 | |||
| b4533d233b39 | Brendan Forster | Merge pull request #1879 from rocketraman/patch-1 | Feb 25 2016 | |||
| 2141c823b44d | Raman Gupta | Update Jetbrains .gitignore dataSources.local.xml | Feb 25 2016 | |||
| 504f444dfa44 | Mario Guenterberg | Update Vim.gitignore | Feb 22 2016 | |||
| 413049c2830d | Etienne Bazin | add .projectile file to emacs .gitignore | Feb 19 2016 | |||
| 9d02ed63c91c | rlee287 | Added Eclipse Recommenders to Eclipse gitignore | Dec 20 2015 | |||
| b6e56775b5ea | Mateusz Kutyba | exclude only community code that is shipped with Magento | Dec 3 2015 | |||
| 571118925dcd | Mateusz Kutyba | exclude only locale en_US | Dec 3 2015 | |||
| 5552f5e36094 | Mateusz Kutyba | simplified rules for Mage* module files | Dec 3 2015 | |||
| 2aa9f9215f0b | Mateusz Kutyba | simplified rules for media dir | Dec 3 2015 | |||
| f527652d3035 | Mateusz Kutyba | new files added in 1.9.2.x | Dec 3 2015 | |||
| 0022763f1493 | Patrício dos Santos | Update CakePHP.gitignore | Nov 20 2015 | |||
| af4b2ae6f488 | Dany Maillard | Update Prestashop.gitignore | Nov 4 2015 | |||
| ad5179127ed5 | Jean Carlo Machado | added doctrine 2 orm default cache and proxy locations | Oct 19 2015 | |||
| daffb4f6bfe4 | Honza Dvorsky | Update Xcode.gitignore | Oct 3 2015 | |||
| 74aa37bfa458 | Honza Dvorsky | Update Objective-C.gitignore | Oct 3 2015 | |||
| c02577acb039 | Honza Dvorsky | Update Swift.gitignore | Oct 3 2015 | |||
| 7830ef7b5965 | Jim Hester | Ignore output from R CMD build and R CMD check | Oct 2 2015 |