Commit Graph

788 Commits

Author SHA1 Message Date
Jean Jordaan a77f7f23fe Covered by global vim template 2013-11-12 15:09:20 +07: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
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
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
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
Carl Suster e0baa57b58 Merge pull request #743 from hkdobrev/master
Add Composer.gitignore for composer packages
2013-11-09 04:01:10 -08:00
Haralan Dobrev 3932f1f0ce Add Composer.gitignore for composer packages
Libraries/Projects using [Composer](http://getcomposer.org) for dependency management should include a `.gitignore` file like this.

It ignores the vendor folder which Composer uses for dependencies, classmaps and others. Composer keeps git repositories in this folder so it is cleaner if it is ignored.

[`composer.lock` should not be ignored.](http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file)

> Commit your application's composer.lock (along with composer.json) into version control.

> For your library you may commit the composer.lock file if you want to. This can help your team to always test against the same dependency versions. However, this lock file will not have any effect on other projects that depend on it. It only has an effect on the main project.
2013-11-09 13:38:32 +02:00
Carl Suster 4f659df36e Remove IntelliJ rules from Android -> Global/JetBrains 2013-11-09 13:02:44 +11:00
Adam Roben 35c6da6ea1 Merge pull request #832 from arcresu/latex
Sort TeX template by packages (and rename)
2013-11-08 15:06:15 -08:00
Carl Suster 81f8222e7f Rename LaTeX->TeX 2013-11-09 09:34:27 +11:00
Manuel Rauber ce47378cc6 Ignore .pyg files from LaTeX's minted package 2013-11-09 09:19:14 +11:00
Carl Suster 70fd1fd45c Sort LaTeX auxiliary files by package 2013-11-09 09:19:14 +11:00
Carl Suster 40e48553fd Merge pull request #828 from vvolkgang/patch-1
Added Visual Studio .suo files
2013-11-08 13:34:20 -08:00
Carl Suster 9ae01d0b64 Rename template IDEA->JetBrains 2013-11-09 08:14:41 +11:00
Carl Suster af886f72c8 Add back out/ for IntelliJ under IDEA 2013-11-09 08:04:35 +11:00
Carl Suster 1ef80036f0 Remove .idea/ from ObjectiveC in favour of Global/IDEA 2013-11-09 07:37:49 +11:00
Carl Suster af9ec6115c Add .idea/tasks.xmk to IDEA ignore suggections 2013-11-09 07:36:40 +11:00
Carl Suster fcf0a9ccab Remove individual JetBrains IDE templates in favour of IDEA template 2013-11-09 07:28:12 +11:00
Carl Suster aa00e7f210 Add an IDEA template to cover all related IDEs 2013-11-09 07:28:12 +11:00
Adam Roben 03de45fa75 Merge pull request #829 from arcresu/patch-1
Add comment to prevent *.sublime-project being ignored.
2013-11-08 12:19:12 -08:00
Carl Suster 4d108dc73d Merge pull request #452 from BFTrick/patch-1
Adding wp-config.php Back Into Version Control
2013-11-08 12:11:35 -08:00