Merge branch 'master' of github.com:github/gitignore into keep-scm-files
- Conflicts:
- Objective-C.gitignore
- Swift.gitignore
Description
Description
Details
Details
- Committed
Honza Dvorsky <jan.dvorsky@yahoo.com> Feb 26 2016, 01:07 - Pushed
aubort Jul 2 2018, 16:12 - Parents
- rGITIGNOREc4ff566a309c: Merge pull request #1871 from guenti/master
rGITIGNOREdaffb4f6bfe4: Update Xcode.gitignore - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 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 | |||
| 0106b2b10f14 | Brendan Forster | Merge pull request #1875 from jutoft/master | Feb 25 2016 | |||
| 0c318a629892 | Brendan Forster | Merge pull request #1876 from ezekeal/patch-1 | Feb 24 2016 | |||
| a623b2fbe888 | Zach Koch | removed elm-package.json | Feb 24 2016 | |||
| 02903096d358 | Jesper Utoft | Add glsdefs to TeX.gitignore | Feb 24 2016 | |||
| 9f8e411bba17 | Brendan Forster | Merge pull request #1853 from Zenuka/bower_components | Feb 24 2016 | |||
| 504f444dfa44 | Mario Guenterberg | Update Vim.gitignore | Feb 22 2016 | |||
| a392c48ccf41 | Brendan Forster | Merge pull request #1865 from hmemcpy/patch-1 | Feb 18 2016 | |||
| e429db118024 | Igal Tabachnik | Adding JetBrains Rider (.NET IDE from JetBrains) specific files to ignore | Feb 18 2016 | |||
| 02950ad8fa2f | Brendan Forster | Merge pull request #1864 from luxidea/patch-2 | Feb 17 2016 | |||
| 16e076df2b19 | 中山雅紀：Nakayama Masanori | Add "__recovery" folder. | Feb 16 2016 | |||
| 5141423fba11 | Brendan Forster | Merge pull request #1862 from SaschaNaz/patch-1 | Feb 16 2016 | |||
| 7d148a0ca14f | Kagami Sascha Rosylight | remove bower_components as an other PR will add it | Feb 15 2016 | |||
| 6ed1790ddaf3 | Kagami Sascha Rosylight | remove duplication | Feb 15 2016 | |||
| 5154697fd8a5 | Kagami Sascha Rosylight | store package files | Feb 15 2016 | |||
| b32c5d5646bb | Kagami Sascha Rosylight | Ignore _pkginfo.txt | Feb 15 2016 | |||
| c84443611174 | Brendan Forster | Merge pull request #1419 from eamsden/master | Feb 14 2016 | |||
| 5c9413f50207 | Brendan Forster | Merge pull request #1471 from lszeremeta/master | Feb 14 2016 | |||
| eab300ef2354 | Łukasz Szeremeta | Merge remote-tracking branch 'upstream/master' | Feb 13 2016 | |||
| 06c9fd748541 | Brendan Forster | Merge pull request #1858 from Harrison-G/patch-2 | Feb 12 2016 | |||
| 00ff4ec1b1c4 | Brendan Forster | Merge pull request #1860 from HIPERCUBE/patch-1 | Feb 12 2016 | |||
| 7730858be3b7 | Brendan Forster | Merge pull request #1859 from Harrison-G/patch-3 | Feb 12 2016 | |||
| 10ec8707f00b | Joowon Ryoo | Update Android.gitignore | Feb 12 2016 | |||
| a2106e309d50 | Harrison G | Fix capitalization of KiCad | Feb 12 2016 | |||
| 76cf90ecba2d | Harrison G | Add Flask instance folder | Feb 12 2016 | |||
| b87d2a984952 | Brendan Forster | Merge pull request #1857 from Harrison-G/patch-1 | Feb 12 2016 | |||
| 1995ac64abf8 | Harrison G | Fix capitalization of IPython | Feb 12 2016 | |||
| 10e5d889b5e1 | Brendan Forster | Merge pull request #1696 from melonmanchan/jspm-ignore | Feb 12 2016 | |||
| 63694d017b24 | Zenuka | bower_components is commented by default | Feb 12 2016 | |||
| e9e59f22594a | Matti Jokitulppo | Merge Node.gitignore with master | Feb 12 2016 | |||
| d18d17f0a1a8 | Brendan Forster | Merge pull request #1695 from jonathanchu/master | Feb 12 2016 | |||
| 6ac648f033c4 | Jonathan Chu | Merge remote-tracking branch 'upstream/master' | Feb 12 2016 | |||
| 3a529da68ab0 | Brendan Forster | Merge pull request #1856 from mcandre/gradle-intellij-workaround | Feb 11 2016 | |||
| cf46e139ad90 | Andrew Pennebaker | work around intellij gradle wrapper refreshing bug | Feb 11 2016 | |||
| ce62a06810c0 | Brendan Forster | Merge pull request #1854 from RobertoNovelo/master | Feb 10 2016 | |||
| 436959591a09 | Roberto Novelo | Merge pull request #1 from RobertoNovelo/enhancement-jetbrains-gitignore | Feb 10 2016 | |||
| cd222dfc626e | Roberto Novelo | Added Library Mappings and VCS Root | Feb 10 2016 | |||
| a23bb4a523a7 | Zenuka | Update VisualStudio.gitignore | Feb 10 2016 | |||
| 9ff1a19de877 | Brendan Forster | Merge pull request #1846 from mcandre/octave-session-info | Feb 10 2016 | |||
| f4e1169a0dd8 | Brendan Forster | Merge pull request #1848 from austinjalexander/patch-1 | Feb 8 2016 | |||
| d6f33de188fa | Brendan Forster | Merge pull request #1847 from nloveladyallen/patch-1 | Feb 8 2016 | |||
| bcbbc6eae2d5 | Austin J. Alexander | fix style by adding space after # | Feb 7 2016 | |||
| 31045e29f8d6 | Noah Lovelady-Allen | Remove redundancy in Global/Vim.gitignore | Feb 7 2016 | |||
| 98a3ab7719ed | Andrew Pennebaker | matlab: ignore octave session info | Feb 6 2016 | |||
| 7e04a3f05c5b | Brendan Forster | Merge pull request #1844 from icylogic/Patch-Eagle | Feb 4 2016 | |||
| 31c960a5ca3d | icylogic | update Eagle.gitignore for .lck | Feb 3 2016 | |||
| 87bd07e50dd9 | Brendan Forster | Merge pull request #1843 from jutoft/master | Feb 3 2016 | |||
| 03e1898c933f | Jesper Utoft | Add ignore for .lox files from fixme package | Feb 3 2016 |