1
0
mirror of https://github.com/github/gitignore synced 2024-11-11 06:18:51 +01:00
Commit Graph

1169 Commits

Author SHA1 Message Date
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
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
Patrick Rauland
1f4bf1f36d merging upstream changes 2013-11-08 13:54:35 -06:00
Carl Suster
3dadf4e9b3 Make sublime-project rule off by default 2013-11-09 06:37:52 +11:00
Carl Suster
024d6e83fc Add comment to prevent *.sublime-project being ignored.
Based on advice in the documentation at
http://www.sublimetext.com/docs/2/projects.html
2013-11-09 06:37:52 +11:00
Adam Roben
c67cfaf01c Merge pull request #830 from kerimdzhanov/fix/node-gitignore
remove `npm-debug.log` entry
2013-11-08 06:32:38 -08:00
Dan Kerimdzhanov
fa1ea3d7f2 remove npm-debug.log entry 2013-11-08 18:34:37 +06:00
Carl Suster
f8ac87bd8f Merge pull request #802 from lukemetz/master
Ignore elf and hex files in C.gitignore
2013-11-07 21:28:17 -08:00
Adam Roben
66f5b6f343 Merge pull request #705 from caiquerodrigues/patch-1
Dart.gitignore updated to reflect instructions provided by authors
2013-11-07 19:55:15 -08:00
Adam Roben
523c52fe52 Merge pull request #814 from xiaogaozi/patch-1
Python.gitignore add coverage.xml
2013-11-07 19:50:15 -08:00
Adam Roben
684a4fe44b Merge pull request #805 from Utumno/patch-1
.classpath and .project files are *meant to be versioned*
2013-11-07 19:44:43 -08:00
Carl Suster
4e85d13e96 Merge pull request #623 from seabre/patch-1
Ignore Leiningen REPL history
2013-11-07 18:54:47 -08:00
Sean Brewer
e4cc7a56ba Merge with latest master from upstream. Fix merge conflict with Leiningen.gitignore 2013-11-07 21:50:41 -05:00
Carl Suster
bd8dab3845 Merge pull request #509 from cjerdonek/master
Make Python .gitignore directory entries match only directories
2013-11-07 18:31:11 -08:00
Chris Jerdonek
c038e773de Make Python .gitignore directory entries match only directories.
This commit also alphabetizes the distribution/packaging section after
separating the directory entries from the file entries.  I left alone
a few entries that I'm not sure about (i.e. *.egg and the
"Mr Developer" section).
2013-11-07 20:13:43 -06:00
Álison Fernandes
6b70795098 Added Visual Studio .suo files
*.suo files are binary, user specific files generated by Visual Studio with some user configuration information, thus, don't need to be versioned.
2013-11-08 01:59:29 +00:00
=
502cb31439 Ignore elf and hex in C.gitignore 2013-11-08 00:12:13 +00:00
Adam Roben
b65855ee93 Merge pull request #636 from msgerbush/patch-1
Reverting change to ignore build subdirectories
2013-11-07 11:42:20 -08:00