Commit Graph

3101 Commits

Author SHA1 Message Date
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
Jens Jahnke
b34ccb3853 Adapted the ignored directories to use dir/ instead of dir/* 2013-11-12 12:20:11 +01:00
Jens Jahnke
ff6fa231f9 Added the new upload directories and ignore the cache directory completely.
With SugarCRM 6.4 the `cache/upload` directory moved to `upload` and
`upload_backup`. These directories can safely be ignored.

Additionally the `cache` directory is now ignored completely because it
leads to the behaviour to use the git repository as a kind of backup
tool if several parts of it are included. Furthermore the directory
structure beneath `cache` is victim of enduring changes by the
developers.

I did also some code cleanup regarding the path names e.g. adding a `/`
before most file and directory names.
2013-11-12 09:37:03 +01: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
Jean Jordaan
930f476c37 Remove patterns covered by other templates
Remove redundant patterns, and patterns for generic backups, version
control dirs, IDEs, OSX.
2013-11-12 14:24:09 +07:00
Carl Suster
b7982d4968 Merge pull request #688 from leek/patch-1
Update Magento.gitignore to tighten the pattern for install.php
2013-11-11 22:37:40 -08:00
Carl Suster
f37b54d58a Merge pull request #597 from TomLiu/master
Ignore magento product image cache
2013-11-11 22:33:01 -08:00
Justin Spahr-Summers
02d84478d6 Merge pull request #391 from mastacheata/patch-1
Add Exception for htaccess file denying access to the cache folder
2013-11-11 22:16:33 -08:00
Carl Suster
699a3ac68a Fix a copy/paste mistake 2013-11-12 16:57:54 +11:00
Jean Jordaan
8646963bba Merge branch 'master' of https://github.com/github/gitignore 2013-11-12 11:28:25 +07:00
Jean Jordaan
43de894452 Ignore multiple vim swapfiles
In case there is more than one swapfile for a file (.swo, .swn, ...)
2013-11-12 11:27:21 +07:00
Carl Suster
1a3b885ef7 Merge pull request #700 from mquigley/master
Don't ignore essential Android Eclipse project and classpath files.
2013-11-11 18:11:15 -08:00
Carl Suster
70aaa4d504 Merge pull request #745 from tunitowen/master
Added gradle (build tool) files to Android gitignore
2013-11-11 17:55:39 -08:00
Carl Suster
09793dd34e Merge pull request #473 from Visgean/master
Merge the django template into the python one since there is a significant overlap
2013-11-11 16:45:53 -08:00
Visgean Skeloru
33b416dc00 Update Python.gitignore 2013-11-12 01:41:53 +01:00
Visgean Skeloru
97dcb89013 #473 no need to have specific gitignore for django 2013-11-12 01:41:29 +01:00
Carl Suster
e105d8c4b2 Merge pull request #838 from tiredpixel/ruby-slashes
Slashify Ruby files and directories.
2013-11-11 13:48:16 -08:00
tiredpixel
ca456f73e4 Unslashify *.gem,*.rbc,.rvmrc .
arcresu pointed out that `*.gem`, `*.rbc`, `.rvmrc` might not be at
the top level in a repository. Thus, remove leading slashes for these.
2013-11-11 21:41:11 +00:00
tiredpixel
3b7ac85ad8 Slashify Ruby files and directories.
Perhaps this is a little pedantic, but without the initial / all
such matches within the repository get ignored, and without the
trailing slash files as well as directories of that name get ignored.
e.g. Specifying `tmp` and `test/tmp` without slashes is redundant, as
`tmp` already ignores `test/tmp`, as well as every other `tmp` and
`tmp/`.
2013-11-11 19:50:01 +00:00
Adam Roben
a1e656a093 Merge pull request #443 from bungeshea/BricxCC
Added Bricx Command Center gitignore
2013-11-11 11:31:13 -08:00
Shea Bunge
9345b6b461 Add comment to BricxCC.gitignore 2013-11-12 06:28:53 +11:00
Shea Bunge
8cbac43dab Move BricxCC.gitignore to Global directory 2013-11-12 06:27:39 +11:00
Adam Roben
c928e22aab Merge pull request #837 from milas/master
Add Azure publish XML file
2013-11-11 10:28:17 -08:00
Milas Bowman
74b6dd1566 Add Azure publish XML file
* Ignore Azure publish *.azurePubxml files
* Add a trailing slash to csx
* Remove random whitespace after build output
2013-11-11 12:52:59 -05:00
Justin Spahr-Summers
52628ac489 Merge pull request #506 2013-11-11 09:51:50 -08:00
Justin Spahr-Summers
1a1de190ae Merge remote-tracking branch 'origin/master' into pr/506
Conflicts:
	Yii.gitignore
2013-11-11 09:51:38 -08:00
Adam Roben
8335a5dad9 Merge pull request #615 from kristens/master
Added nunit result and visual state
2013-11-11 09:26:43 -08:00
Adam Roben
0eb7703d11 Merge pull request #582 from xnt/patch-1
Ignoring "bld" directory
2013-11-11 09:24:25 -08:00
Adam Roben
81c11d90a3 Merge pull request #836 from jephir/fix-unity
Prevent Unity .gitignore from ignoring non-Unity project files
2013-11-11 09:11:10 -08:00
Jephir
4469ba4938 Prevent Unity .gitignore from ignoring non-Unity project files
Unity only generates project files in the top-level directory.
However, the current .gitignore will ignore all project files even
if they were not generated by Unity.

It is sometimes necessary to include non-Unity project files for
level editors or other utility projects that have been added to the
repository.
2013-11-11 12:09:08 -05:00
Adam Roben
768534c42f Merge pull request #834 from arcresu/ruby-version
Unify approach to ruby environment normalisation
2013-11-11 08:07:32 -08:00
Stefan Vatov
e342a8e7db Added .gitignore for Scrivener 2013-11-11 14:34:42 +00:00
Adam Roben
e85ec2d828 Merge pull request #488 from nanadevelopment/eeConfigAdd
Added config files that should not be placed into repos by default as th...
2013-11-11 05:37:55 -08:00
Adam Roben
7bf9065750 Merge pull request #477 from neilkelty/master
Include crash.log file in nanoc.gitignore
2013-11-11 05:26:57 -08:00
Adam Roben
2fea1b6b92 Merge pull request #831 from arcresu/idea
Consolidate various IDE tempates into Global/JetBrains template
2013-11-11 05:25:58 -08:00
Adam Roben
9463c86d9b Merge pull request #424 from MichaelMBishop/master
added NotepadPP.gitignore for Notepad++
2013-11-11 05:15:35 -08:00
Justin Spahr-Summers
b5ff707987 Merge pull request #421 from matheussl/master
Add "pip-delete-this-directory.txt"
2013-11-10 23:12:47 -08:00
Guillaume Girou
12d95d1ff8 Move editor specific files into a new DartEditor.gitignore 2013-11-10 17:28:41 +01:00
Carl Suster
669668fb14 Join comments in rails template 2013-11-10 21:39:33 +11:00
Carl Suster
efd3490a54 Tighten some ruby ignore patterns 2013-11-10 21:13:54 +11:00
Carl Suster
0ac2f7cb82 Optionally ignore ruby env normalisation files, with comments 2013-11-10 21:12:01 +11:00
Carl Suster
d72190c56a Merge pull request #833 from benmoss/master
Leiningen by default creates a 'target' directory, not 'targets'
2013-11-09 16:30:54 -08:00
Ben Moss
f4e8e686d6 Leiningen by default creates a 'target' directory, not 'targets' 2013-11-09 11:32:03 -05:00