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

883 Commits

Author SHA1 Message Date
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
Adam Roben
82c8b636e9 Merge pull request #777 from fivef/master
Create ROS.gitignore
2013-11-26 19:13:43 -08:00
Adam Roben
bb53647b8a Merge pull request #726 from jtimberman/chef-cookbook
Add ignore file for Chef cookbooks
2013-11-26 18:16:18 -08:00
Justin Spahr-Summers
f0f5e38db2 Merge pull request #760 2013-11-13 14:19:22 -08:00
Justin Spahr-Summers
4a7ab06382 Remove generic and Java ignore patterns
Those belong in other ignore files.
2013-11-13 14:19:16 -08:00
unknown
e57da65843 Moved file to Global 2013-11-13 15:19:36 -05:00
Justin Spahr-Summers
52ec58209b Merge pull request #755 from ohmanger/patch-1
Ignore local.xml as this contains database credentials.
2013-11-12 20:46:50 -08:00
Justin Spahr-Summers
1b76d53beb Merge pull request #738 from Blaisorblade/patch-1
Create Agda.gitignore
2013-11-12 20:45:47 -08:00
Justin Spahr-Summers
3012b56563 Merge pull request #725 from shivam5992/patch-1
Deployed file ignore
2013-11-12 20:42:35 -08:00
Markus Olsson
2d44869b49 Merge pull request #663 from abergs/patch-1
Visual Studio: Ignore Chutzpah testrunnerfiles
2013-11-12 12:26:32 -08:00
Justin Spahr-Summers
cbf090d44f Merge pull request #682 from fsw/master
ignoring *.autosave files generated by QtCreator
2013-11-12 10:40:46 -08:00
Justin Spahr-Summers
e240feae83 Merge pull request #657 from MrBogomips/master
PlayFramework: exclude assets under the bin/ directory generated by the compiler
2013-11-12 10:37:21 -08:00
Justin Spahr-Summers
306ed4acf9 Merge pull request #655 from conradolega/master
.gitignore for Meteor (and Meteorite)
2013-11-12 10:36:59 -08:00
Adam Roben
7e70ab946a Merge pull request #845 from gillesdemey/patch-1
Update VisualStudio.gitignore
2013-11-12 10:21:15 -08:00
Gilles De Mey
25ec5b7c3e Update VisualStudio.gitignore
I have no idea what this is doing here, totally unrelated to Visual Studio. There is a special OSX gitignore file that you can use.
2013-11-12 19:08:25 +01:00
Adam Roben
ce72f3a03c Merge pull request #843 from vikraman/patch-1
Ignore files generated by cabal sandbox
2013-11-12 09:20:40 -08:00
Vikraman Choudhury
40917a4d2f Ignore files generated by cabal sandbox
https://github.com/haskell/cabal/wiki/Package-Environments#sandbox-command
2013-11-12 22:49:11 +05:30
Adam Roben
8d71b3128c Merge pull request #844 from llonchj/python
Added Sphinx documentation
2013-11-12 09:17:59 -08:00
Jordi Llonch
088535f046 Added Sphinx documentation 2013-11-13 04:13:14 +11:00
Adam Roben
df2de98c25 Merge pull request #842 from borntyping/patch-1
Add .cache to the Python .gitignore
2013-11-12 08:25:57 -08:00
Sam Clements
b75c902dbb Add .cache to the Python .gitignore
`.cache` is generated when unittests are run with py.test
2013-11-12 16:19:30 +00:00
Adam Roben
af405251f0 Merge pull request #730 from Lazersmoke/patch-1
Added Kate ignore file in Global folder
2013-11-12 08:11:17 -08:00
Adam Roben
f7c1a9938e Merge pull request #683 from jkodumal/patch-1
Add .hsenv to .gitignore
2013-11-12 08:09:39 -08:00
Adam Roben
de877c3e23 Merge pull request #681 from filipelenfers/master
Ensime ignores
2013-11-12 08:07:58 -08:00
Adam Roben
fc73773a74 Merge pull request #645 from pxqr/master
Ignore emacs flymake-mode temp files.
2013-11-12 08:04:57 -08:00
Adam Roben
55ccaf54bd Merge pull request #563 from fibo/master
.gitignore for VVVV
2013-11-12 08:03:03 -08:00
Adam Roben
2559777165 Merge pull request #626 from borneq/patch-1
*.~* instead *.~*~ for backup files
2013-11-12 08:00:33 -08:00
Adam Roben
a69969b575 Merge pull request #624 from finnjohnsen/patch-1
removed implicit ignore
2013-11-12 07:59:57 -08:00
Adam Roben
bfcd76a786 Merge pull request #569 from AlainFolletete/master
Add GitIgnore file for Prestashop Software
2013-11-12 07:57:14 -08:00
Adam Roben
1e58a0c110 Merge pull request #646 from manojlds/master
Option to unignore repositories.config
2013-11-12 07:55:25 -08:00
Adam Roben
a0570aeae8 Merge pull request #566 from fidelski/add-obvious-autotools-files
Add stamp-h1 to ignored files
2013-11-12 07:53:55 -08:00
Adam Roben
d1ee264f9e Merge pull request #586 from simonbuehler/master
Added DebugPublic of Matrox DSK
2013-11-12 07:53:02 -08:00
Adam Roben
b04b8b24aa Merge pull request #561 from stuartpb/cloud9
Add Cloud9 gitignore
2013-11-12 07:51:08 -08:00
Adam Roben
6bcd83ec33 Merge pull request #606 from bicycle-nerd/patch-1
adding ignore for Telerik JustCode files
2013-11-12 07:50:24 -08:00
Adam Roben
4dd9d7376d Merge pull request #591 from mjgardner/master
fixing pattern for compiled elisp
2013-11-12 07:42:54 -08:00
Adam Roben
be029b7aeb Merge pull request #584 from zafarella/master
added ignorance of tmp release files of maven
2013-11-12 07:41:12 -08:00
Adam Roben
47436efe92 Merge pull request #538 from hallco978/patch-1
Update VisualStudio.gitignore for mightymoose
2013-11-12 07:37:31 -08:00
Carl Suster
f3503f42c6 Merge pull request #784 from yatskevich/master
Add .idea_modules/ to Global/JetBrains.gitignore (from sbt-idea plugin)
2013-11-12 03:45:42 -08:00
Ivan Yatskevich
94a2b3b668 add .idea_modules/ to Global/JetBrains.gitignore 2013-11-12 14:38:34 +03:00
Ivan Yatskevich
ba898ebefd merge upstream/master 2013-11-12 14:32:18 +03:00
Carl Suster
727777af2d Merge pull request #839 from jean/master
Clean up the plone template
2013-11-12 00:13:58 -08:00
Jean Jordaan
a77f7f23fe Covered by global vim template 2013-11-12 15:09:20 +07:00
Carl Suster
41baaa27a6 Merge pull request #629 from ChinggizKhan/minor-drupal-gitignore-issue
Correct minor ordering issue on Drupal gitignore
2013-11-12 00:01:04 -08:00