1
0
mirror of https://github.com/github/gitignore synced 2024-11-23 12:14:21 +01:00
Commit Graph

2539 Commits

Author SHA1 Message Date
Honza Dvorsky
272913dd9d Merge branch 'master' of github.com:github/gitignore into keep-scm-files
# Conflicts:
#	Objective-C.gitignore
#	Swift.gitignore
2016-02-26 00:07:20 +00:00
Brendan Forster
c4ff566a30 Merge pull request #1871 from guenti/master
Update Vim.gitignore
2016-02-26 08:18:26 +11:00
Brendan Forster
b4533d233b Merge pull request #1879 from rocketraman/patch-1
Update Jetbrains .gitignore dataSources.local.xml
2016-02-26 07:59:25 +11:00
Raman Gupta
2141c823b4 Update Jetbrains .gitignore dataSources.local.xml 2016-02-25 11:57:01 -05:00
Abhishek Kumar Singh
a623e9e6d4 Update Python.gitignore for celery-beat schedule binary file. 2016-02-25 12:27:21 +05:30
Brendan Forster
0106b2b10f Merge pull request #1875 from jutoft/master
Add *.glsdefs to TeX.gitignore
2016-02-25 11:50:05 +11:00
Brendan Forster
0c318a6298 Merge pull request #1876 from ezekeal/patch-1
removed elm-package.json
2016-02-25 09:21:44 +11:00
Zach Koch
a623b2fbe8 removed elm-package.json
elm-package.json lists dependencies, so it shouldn't be ignored
2016-02-24 16:03:31 -06:00
Jesper Utoft
02903096d3 Add glsdefs to TeX.gitignore 2016-02-24 11:27:39 +01:00
Brendan Forster
9f8e411bba Merge pull request #1853 from Zenuka/bower_components
Add bower_components to VisualStudio.gitignore
2016-02-24 12:00:08 +11:00
Mario Guenterberg
504f444dfa Update Vim.gitignore
Added auto-generated tag files.
2016-02-22 17:50:16 +01:00
Etienne Bazin
413049c283 add .projectile file to emacs .gitignore 2016-02-19 10:12:44 +01:00
Brendan Forster
a392c48ccf Merge pull request #1865 from hmemcpy/patch-1
Adding JetBrains Rider (.NET IDE from JetBrains) specific files
2016-02-18 18:39:26 +11:00
Igal Tabachnik
e429db1180 Adding JetBrains Rider (.NET IDE from JetBrains) specific files to ignore 2016-02-18 09:31:24 +02:00
Brendan Forster
02950ad8fa Merge pull request #1864 from luxidea/patch-2
Add "__recovery" folder.
2016-02-17 10:57:57 +11:00
中山雅紀:Nakayama Masanori
16e076df2b Add "__recovery" folder. 2016-02-17 02:19:09 +09:00
Brendan Forster
5141423fba Merge pull request #1862 from SaschaNaz/patch-1
Ignore some Windows Store package related files
2016-02-16 20:34:03 +11:00
Kagami Sascha Rosylight
7d148a0ca1 remove bower_components as an other PR will add it 2016-02-16 03:11:43 +09:00
Kagami Sascha Rosylight
6ed1790dda remove duplication 2016-02-16 03:09:11 +09:00
Kagami Sascha Rosylight
5154697fd8 store package files 2016-02-16 03:05:30 +09:00
Kagami Sascha Rosylight
b32c5d5646 Ignore _pkginfo.txt
https://www.google.com/?gws_rd=ssl#q=_pkginfo.txt&nfpr=1

I found I have this file not being ignored and a quick search shows these files :/
2016-02-16 02:45:41 +09:00
Brendan Forster
c844436111 Merge pull request #1419 from eamsden/master
Add pattern to match dist-* directories for Haskell
2016-02-15 09:35:38 +11:00
Brendan Forster
5c9413f502 Merge pull request #1471 from lszeremeta/master
Ignore Kile and kBibTeX backup files
2016-02-14 11:22:37 +11:00
Łukasz Szeremeta
eab300ef23 Merge remote-tracking branch 'upstream/master'
Conflicts:
	TeX.gitignore
2016-02-13 16:37:16 +01:00
Brendan Forster
06c9fd7485 Merge pull request #1858 from Harrison-G/patch-2
Add Flask instance folder
2016-02-13 07:37:07 +11:00
Brendan Forster
00ff4ec1b1 Merge pull request #1860 from HIPERCUBE/patch-1
Update Android.gitignore
2016-02-13 07:35:27 +11:00
Brendan Forster
7730858be3 Merge pull request #1859 from Harrison-G/patch-3
Fix capitalization of KiCad
2016-02-13 07:31:08 +11:00
Joowon Ryoo
10ec8707f0 Update Android.gitignore
Add some files
2016-02-13 01:13:30 +09:00
Harrison G
a2106e309d Fix capitalization of KiCad
According to their website, the correct capitalization is KiCad, not KiCAD.
2016-02-12 07:17:09 -05:00
Harrison G
76cf90ecba Add Flask instance folder
Contains private configuration. Equivalent to Django's local_settings.py.
2016-02-12 07:14:41 -05:00
Brendan Forster
b87d2a9849 Merge pull request #1857 from Harrison-G/patch-1
Fix capitalization of IPython
2016-02-12 22:21:35 +11:00
Harrison G
1995ac64ab Fix capitalization of IPython 2016-02-12 06:06:03 -05:00
Brendan Forster
10e5d889b5 Merge pull request #1696 from melonmanchan/jspm-ignore
Ignore JSPM package folder
2016-02-12 21:50:39 +11:00
Zenuka
63694d017b bower_components is commented by default 2016-02-12 08:41:18 +01:00
Matti Jokitulppo
e9e59f2259 Merge Node.gitignore with master 2016-02-12 07:44:43 +02:00
Brendan Forster
d18d17f0a1 Merge pull request #1695 from jonathanchu/master
Ignore all Emacs flycheck_*.el files
2016-02-12 14:07:22 +11:00
Jonathan Chu
6ac648f033 Merge remote-tracking branch 'upstream/master' 2016-02-11 22:03:05 -05:00
Brendan Forster
3a529da68a Merge pull request #1856 from mcandre/gradle-intellij-workaround
work around intellij gradle wrapper refreshing bug
2016-02-12 07:57:58 +11:00
Andrew Pennebaker
cf46e139ad work around intellij gradle wrapper refreshing bug 2016-02-11 14:21:19 -06:00
Brendan Forster
ce62a06810 Merge pull request #1854 from RobertoNovelo/master
Added Library Mappings and VCS Root
2016-02-11 09:20:52 +11:00
Roberto Novelo
436959591a Merge pull request #1 from RobertoNovelo/enhancement-jetbrains-gitignore
Added Library Mappings and VCS Root
2016-02-10 12:46:24 -06:00
Roberto Novelo
cd222dfc62 Added Library Mappings and VCS Root
These files differ on Windows and OS X.
2016-02-10 12:45:16 -06:00
Zenuka
a23bb4a523 Update VisualStudio.gitignore
Added bower_components to .gitignore
2016-02-10 16:38:54 +01:00
Brendan Forster
9ff1a19de8 Merge pull request #1846 from mcandre/octave-session-info
matlab: ignore octave session info
2016-02-10 13:20:57 +10:30
Brendan Forster
f4e1169a0d Merge pull request #1848 from austinjalexander/patch-1
fix style in Python.gitignore by adding space after #
2016-02-09 08:57:59 +10:30
Brendan Forster
d6f33de188 Merge pull request #1847 from nloveladyallen/patch-1
Remove redundancy in Global/Vim.gitignore
2016-02-09 08:57:42 +10:30
Austin J. Alexander
bcbbc6eae2 fix style by adding space after # 2016-02-07 13:08:03 -05:00
Noah Lovelady-Allen
31045e29f8 Remove redundancy in Global/Vim.gitignore
Anything matched by `*.un~` will also be matched by the last rule, `*~`.
2016-02-07 08:57:08 -05:00
Andrew Pennebaker
98a3ab7719 matlab: ignore octave session info 2016-02-06 02:51:00 -06:00
Brendan Forster
7e04a3f05c Merge pull request #1844 from icylogic/Patch-Eagle
update Eagle.gitignore for .lck
2016-02-05 08:03:41 +10:30