Commit Graph

1699 Commits

Author SHA1 Message Date
Markus Olsson
07e4992c29 Merge pull request #896 from github/ignore-rails-config-secret
Rails: Ignore config/secrets.yml
2013-12-16 05:18:52 -08:00
Markus Olsson
da654e84c6 Merge pull request #891 from hulet/duplicate-fix
Remove duplicate rule
2013-12-16 05:15:39 -08:00
Shawn Davenport
8c525145ac secrets.yml, not secret. 2013-12-14 12:58:17 -06:00
Shawn Davenport
9a2da27935 Rails: Ignore the new home of secret_key_base. 2013-12-14 12:55:32 -06:00
Evandro Leopoldino Gonçalves
33dd88ab84 Update Python.gitignore 2013-12-14 12:07:26 -02:00
Daniel Niedergesäß
402607d593 Update to Magento 1.8.x 2013-12-12 16:10:56 +01:00
Steve Hulet
5434327243 Remove duplicate rule 2013-12-09 21:21:57 -08:00
Alejandro Celaya
c2351631b7 Included missing new line 2013-12-03 14:51:50 +01:00
Alejandro Celaya
34f93ffcbc Created Zend Framework 2 gitignore file 2013-12-03 14:47:58 +01:00
Jota Junior
8f2db01f1d Remove astherisk before trailing slash 2013-12-02 19:15:00 -02:00
Richard Astbury
c65905abd2 added node_modules 2013-11-29 20:22:42 +00:00
Adam Roben
7b684c2866 Merge pull request #785 from NickHodges/master
Update Delphi to include new extensions
2013-11-27 12:10:58 -08:00
Nick Hodges
412d6907bc Merging upstream 2013-11-27 15:03:08 -05:00
Jens Jahnke
1c58091723 Explanations for ignoring the cache directory
I wrote a more explanatory comment regarding the cache directory
and why it is ignored.
2013-11-27 17:30:57 +01:00
Adam Roben
a6dc172eaa Merge pull request #879 from phmarek/master
Added file for Common Lisp.
2013-11-27 06:52:32 -08:00
Adam Roben
1c7c01521a Merge pull request #878 from minsOne/master
Added ipa file to Objective-C.gitignore
2013-11-27 06:50:06 -08:00
Adam Roben
b81b5f92d7 Merge pull request #788 from sjwoodr/master
Update Java to exclude J2ME Mobile Tools for Java
2013-11-27 06:44:12 -08:00
Steve Woodruff
48b7b84b62 Java ME update for .mtj.tmp 2013-11-27 09:30:56 -05:00
Philipp Marek
277b8358f8 Added file for Common Lisp. 2013-11-27 07:31:41 +01:00
minsOne
e3fd044268 Added ipa file to Objective-C.gitignore 2013-11-27 14:40:07 +09:00
Adam Roben
513d1aab1f Merge pull request #876 from jmillerdesign/patch-2
Use absolute paths to the files to ignore
2013-11-26 20:42:46 -08:00
J. Miller
413a9892b5 Use absolute paths to the files to ignore
This fixes an issue where index.php within a theme directory would be ignored, when the intention was to just ignore the index.php file in the root.
2013-11-26 20:37:48 -08:00
Adam Roben
759bcc3e62 Merge pull request #875 from four04/add-common-linux-compile-file-extensions
C: Ignore Some Common File Extensions for Binaries on Linux
2013-11-26 20:09:39 -08:00
Adam Roben
753c995244 Merge pull request #871 from mattrubin/master
Remove duplicate line in Objective-C.gitignore
2013-11-26 20:06:26 -08:00
Adam Roben
c2c74647f2 Merge pull request #869 from j4y/master
plugin.xml shouldn't be in source control.  This is a Grails plugin artifact
2013-11-26 20:05:01 -08:00
Adam Roben
cbda8a4d7f Merge pull request #870 from CaseyB/master
Ignore MonoDevelop cache files
2013-11-26 20:02:55 -08:00
Adam Roben
288442e180 Merge pull request #866 from stefan-vatov/master
Added .gitignore for Scrivener
2013-11-26 20:00:05 -08:00
Kristofer Rye
c76bbb50c0 Merge branch 'master' into add-common-linux-compile-file-extensions 2013-11-26 22:59:01 -05:00
Adam Roben
6604167da5 Merge pull request #864 from oschrenk/patch-4
Ignore worksheet directory
2013-11-26 19:57:49 -08:00
Kristofer Rye
a79b082024 Merge branch 'master' into add-common-linux-compile-file-extensions
More updates
2013-11-26 22:57:22 -05:00
Adam Roben
43c205b5df Merge pull request #862 from jaseemabid/emacs
Ignore elpa and eshell generated files
2013-11-26 19:56:16 -08:00
Adam Roben
3fb1b419f2 Merge pull request #861 from jaseemabid/elisp
Ignore file for elisp projects
2013-11-26 19:55:57 -08:00
Kristofer Rye
c8d99ff857 Merge branch 'master' into add-common-linux-compile-file-extensions
More upstream merges
2013-11-26 22:55:19 -05:00
Adam Roben
8e9563a7c9 Merge pull request #856 from oschrenk/patch-3
Ignore files created by maven-release-plugin
2013-11-26 19:51:32 -08:00
Adam Roben
cea67aabe0 Merge pull request #853 from danieljabailey/master
Add Lazarus IDE ignore file (in global dir this time)
2013-11-26 19:50:24 -08:00
Adam Roben
0bd7638db9 Merge pull request #852 from kdeldycke/patch-1
Ignore rope files.
2013-11-26 19:50:06 -08:00
Adam Roben
a07745af8b Merge pull request #851 from rsolomo/patch-1
add 'build' to Node.gitignore
2013-11-26 19:49:04 -08:00
Adam Roben
8cc9533f34 Merge pull request #850 from Jiri-Kremser/master
Adding 4 directories generated by GWT compiler.
2013-11-26 19:48:40 -08:00
Adam Roben
926389c7cc Merge pull request #849 from Danimoth/patch-1
Change Eclipse.gitignore to correctly handle bin/ and tmp/ directories
2013-11-26 19:48:19 -08:00
Kristofer Rye
38488f2440 Merge branch 'master' into add-common-linux-compile-file-extensions
Upstream merges
2013-11-26 22:42:07 -05:00
Adam Roben
80f79ec2af Merge pull request #536 from troii/gradle
Gradle build system ignore
2013-11-26 19:38:45 -08:00
Adam Roben
51a1221f50 Merge pull request #835 from ggirou/master
Move editor specific files into a new DartEditor.gitignore
2013-11-26 19:37:23 -08:00
Kristofer Rye
93b7ac4c09 Merge branch 'master' into add-common-linux-compile-file-extensions
I messed this up partially.
2013-11-26 22:32:38 -05:00
Adam Roben
ddef3121c6 Merge pull request #728 from zyrx/master
DW Dreamweaver added files
2013-11-26 19:32:13 -08:00
Kristofer Rye
c16b3bb8cf Merge branch 'master' of git://github.com/github/gitignore into add-common-linux-compile-file-extensions
Conflicts:
	C.gitignore

Updates done.
2013-11-26 22:31:25 -05:00
Adam Roben
ecfdeba71e Merge pull request #817 from jimmyandrade/patch-1
Update Joomla.gitignore to ignore J2.5 files
2013-11-26 19:27:03 -08:00
Adam Roben
5e5dd80518 Merge pull request #812 from sableloki/patch-for-yeoman
Template for Yeoman Projects
2013-11-26 19:25:49 -08:00
Adam Roben
06a3ead3d1 Merge pull request #800 from johnkharvey/stella
Add file for Atari 2600 / Atari 7800 assemblers
2013-11-26 19:25:22 -08:00
Adam Roben
741defffdd Merge pull request #806 from torokmark/master
Added: ignore Ada object and ali files
2013-11-26 19:24:26 -08:00
Adam Roben
4424d80352 Merge pull request #789 from Lance0312/archlinuxpkg
Add .gitignore for Arch Linux Packages
2013-11-26 19:19:49 -08:00