From 0d1ef635cc7e394ab60d44291cd629a1d2639124 Mon Sep 17 00:00:00 2001 From: Visgean Skeloru Date: Mon, 12 Nov 2012 17:54:20 +0100 Subject: [PATCH 01/18] Django is python Django should have same ignores as python because it is python --- Django.gitignore | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/Django.gitignore b/Django.gitignore index d9437c31..3416fbb3 100644 --- a/Django.gitignore +++ b/Django.gitignore @@ -1,4 +1,40 @@ +# Django stuff: *.log *.pot -*.pyc -local_settings.py + +# Python stuff: +*.py[cod] + +# C extensions +*.so + +# Packages +*.egg +*.egg-info +dist +build +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg +lib +lib64 + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox +nosetests.xml + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject \ No newline at end of file From 407664cbb5c69f8719cb7f4a7c75461c8f5607bd Mon Sep 17 00:00:00 2001 From: Mani Date: Sun, 13 Jan 2013 10:33:20 +0530 Subject: [PATCH 02/18] Added changes for Yii framework See http://www.yiiframework.com/wiki/307/startin-your-yii-project-reference-guide-with-git-vcs-in-linux/#hh6 --- Yii.gitignore | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Yii.gitignore b/Yii.gitignore index 45a9a931..834eb17c 100644 --- a/Yii.gitignore +++ b/Yii.gitignore @@ -1,3 +1,6 @@ -assets/ -protected/runtime/ +assets/* +!assets/.gitignore +protected/runtime/* +!protected/runtime/.gitignore +protected/data/*.db themes/classic/views/ \ No newline at end of file From 5fe13b7e6f89be9d064a0af6c4f1a4efc32930fd Mon Sep 17 00:00:00 2001 From: Shea Bunge Date: Sat, 19 Jan 2013 17:02:34 +1100 Subject: [PATCH 03/18] Added Bricx Command Center gitignore --- BricxCC.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 BricxCC.gitignore diff --git a/BricxCC.gitignore b/BricxCC.gitignore new file mode 100644 index 00000000..9a2fdfae --- /dev/null +++ b/BricxCC.gitignore @@ -0,0 +1,2 @@ +*.bak +*.sym \ No newline at end of file From 0b0b6745632c4cb3c2384082cb112638c2d6f9bb Mon Sep 17 00:00:00 2001 From: Vicente Plata Date: Wed, 13 Mar 2013 01:12:33 -0700 Subject: [PATCH 04/18] Ignoring "bld" directory Store apps (or at least the Javascript ones) build to a "bld" directory. Although "debug" and "release" are ignored, any custom build Configuration (created through configuration manager) will be added, unless we ignore the whole bld dir. --- VisualStudio.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 99456160..adc37e04 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -12,6 +12,7 @@ [Rr]elease/ x64/ build/ +bld/ [Bb]in/ [Oo]bj/ From f41aaad6f9e8eaad13b59d23d5bdfe6e724e0b86 Mon Sep 17 00:00:00 2001 From: Kristen Date: Thu, 11 Apr 2013 22:46:03 +0100 Subject: [PATCH 05/18] Added nunit result and state file --- VisualStudio.gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 99456160..343acb29 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -19,6 +19,10 @@ build/ [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* +#NUNIT +*.VisualState.xml +TestResult.xml + *_i.c *_p.c *.ilk From 35a4fcf967cf72a50437aa037dab05da8f274e88 Mon Sep 17 00:00:00 2001 From: Matt Quigley Date: Sat, 6 Jul 2013 19:06:59 -0700 Subject: [PATCH 06/18] Don't ignore essential Eclipse project files. The .project and important .classpath files are a part of an Android Eclipse project, and their changes should be stored in the repository. Although there may be a case for ignoring these files in very rare situations, they don't justify belonging in a generic template. The .project file is generally recreatable with a new import without difficulty, but it still may have important configuration such as extra build steps. More importantly, .classpath is absolutely essential for a project to build correctly and cannot be automatically generated unless there is nothing extra on the classpath. Reverts commit 3ad9edaa2. --- Android.gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Android.gitignore b/Android.gitignore index 87a44e0e..d1b2a3be 100644 --- a/Android.gitignore +++ b/Android.gitignore @@ -15,10 +15,6 @@ gen/ # Local configuration file (sdk path, etc) local.properties -# Eclipse project files -.classpath -.project - # Proguard folder generated by Eclipse proguard/ From 1d68d1ee81d06025f7e8516971a2493b86fb490d Mon Sep 17 00:00:00 2001 From: Tony Owen Date: Wed, 21 Aug 2013 09:43:55 +0100 Subject: [PATCH 07/18] Added gradle files to Android gitignore --- Android.gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Android.gitignore b/Android.gitignore index 87a44e0e..1b3c66e7 100644 --- a/Android.gitignore +++ b/Android.gitignore @@ -12,6 +12,10 @@ bin/ gen/ +# Ignore gradle files +.gradle/ +build/ + # Local configuration file (sdk path, etc) local.properties From 0ac2f7cb820bf31e15e174d4061a8792686e629e Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Sun, 10 Nov 2013 21:12:01 +1100 Subject: [PATCH 08/18] Optionally ignore ruby env normalisation files, with comments --- Rails.gitignore | 15 ++++++++++++--- Ruby.gitignore | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Rails.gitignore b/Rails.gitignore index 2c74f70f..2debe997 100644 --- a/Rails.gitignore +++ b/Rails.gitignore @@ -3,9 +3,6 @@ .sass-cache capybara-*.html .rspec -.rvmrc -/.bundle -/vendor/bundle /log /tmp /db/*.sqlite3 @@ -16,3 +13,15 @@ capybara-*.html rerun.txt pickle-email-*.html config/initializers/secret_token.rb + +## Environment normalisation: +/.bundle +/vendor/bundle + +# these should be checked in to normalise the environment: +# Gemfile.lock +# .ruby-version +# .ruby-gemset + +# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: +.rvmrc diff --git a/Ruby.gitignore b/Ruby.gitignore index 560d1a6a..a0914d36 100644 --- a/Ruby.gitignore +++ b/Ruby.gitignore @@ -1,10 +1,8 @@ *.gem *.rbc -.bundle .config coverage InstalledFiles -lib/bundler/man pkg rdoc spec/reports @@ -16,3 +14,16 @@ tmp .yardoc _yardoc doc/ + +## Environment normalisation: +.bundle +lib/bundler/man + +# for a library or gem, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# Gemfile.lock +# .ruby-version +# .ruby-gemset + +# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: +.rvmrc From efd3490a54ae595bc9fa0444922a4b3c1b83a153 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Sun, 10 Nov 2013 21:13:54 +1100 Subject: [PATCH 09/18] Tighten some ruby ignore patterns --- Ruby.gitignore | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Ruby.gitignore b/Ruby.gitignore index a0914d36..b20c5ce6 100644 --- a/Ruby.gitignore +++ b/Ruby.gitignore @@ -3,21 +3,21 @@ .config coverage InstalledFiles -pkg -rdoc -spec/reports -test/tmp -test/version_tmp -tmp +/pkg/ +/spec/reports +/test/tmp +/test/version_tmp +/tmp/ -# YARD artifacts -.yardoc -_yardoc -doc/ +## Documentation cache and generated files: +/.yardoc +/_yardoc +/doc/ +/rdoc ## Environment normalisation: -.bundle -lib/bundler/man +/.bundle +/lib/bundler/man # for a library or gem, you might want to ignore these files since the code is # intended to run in multiple environments; otherwise, check them in: From 669668fb14bebf2231b7bbd531c76cd52ba9d29d Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Sun, 10 Nov 2013 21:39:33 +1100 Subject: [PATCH 10/18] Join comments in rails template --- Rails.gitignore | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Rails.gitignore b/Rails.gitignore index 2debe997..b4be5c7b 100644 --- a/Rails.gitignore +++ b/Rails.gitignore @@ -18,10 +18,8 @@ config/initializers/secret_token.rb /.bundle /vendor/bundle -# these should be checked in to normalise the environment: -# Gemfile.lock -# .ruby-version -# .ruby-gemset +# these should all be checked in to normalise the environment: +# Gemfile.lock, .ruby-version, .ruby-gemset # unless supporting rvm < 1.11.0 or doing something fancy, ignore this: .rvmrc From 4469ba49389225d35d489c9de9ebd7833bfa004d Mon Sep 17 00:00:00 2001 From: Jephir Date: Mon, 11 Nov 2013 12:05:58 -0500 Subject: [PATCH 11/18] 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. --- Unity.gitignore | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Unity.gitignore b/Unity.gitignore index 123c9928..682085a5 100644 --- a/Unity.gitignore +++ b/Unity.gitignore @@ -3,8 +3,8 @@ [Oo]bj/ # Autogenerated VS/MD solution and project files -*.csproj -*.unityproj -*.sln -*.suo -*.user +/*.csproj +/*.unityproj +/*.sln +/*.suo +/*.user From 74b6dd15662be28131bc4e401a40ea911f2014ea Mon Sep 17 00:00:00 2001 From: Milas Bowman Date: Mon, 11 Nov 2013 12:52:59 -0500 Subject: [PATCH 12/18] Add Azure publish XML file * Ignore Azure publish *.azurePubxml files * Add a trailing slash to csx * Remove random whitespace after build output --- VisualStudio.gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 504b58ad..e9649177 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -7,7 +7,6 @@ *.sln.docstates # Build results - [Dd]ebug/ [Rr]elease/ x64/ @@ -105,13 +104,14 @@ publish/ # Publish Web Output *.Publish.xml +*.azurePubxml # NuGet Packages Directory ## TODO: If you have NuGet Package Restore enabled, uncomment the next line #packages/ # Windows Azure Build Output -csx +csx/ *.build.csdef # Windows Store app package directory From 8cbac43dabf9c8646672a715213213a996161b08 Mon Sep 17 00:00:00 2001 From: Shea Bunge Date: Tue, 12 Nov 2013 06:27:39 +1100 Subject: [PATCH 13/18] Move BricxCC.gitignore to Global directory --- BricxCC.gitignore => Global/BricxCC.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename BricxCC.gitignore => Global/BricxCC.gitignore (100%) diff --git a/BricxCC.gitignore b/Global/BricxCC.gitignore similarity index 100% rename from BricxCC.gitignore rename to Global/BricxCC.gitignore From 9345b6b46138e6ad16f034f033a2021a247d4ac9 Mon Sep 17 00:00:00 2001 From: Shea Bunge Date: Tue, 12 Nov 2013 06:28:53 +1100 Subject: [PATCH 14/18] Add comment to BricxCC.gitignore --- Global/BricxCC.gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Global/BricxCC.gitignore b/Global/BricxCC.gitignore index 9a2fdfae..c1d16a46 100644 --- a/Global/BricxCC.gitignore +++ b/Global/BricxCC.gitignore @@ -1,2 +1,4 @@ +# Bricx Command Center IDE +# http://bricxcc.sourceforge.net *.bak -*.sym \ No newline at end of file +*.sym From 3b7ac85ad84a6815b193ed91bf112e99b0a1eec3 Mon Sep 17 00:00:00 2001 From: tiredpixel Date: Mon, 11 Nov 2013 19:48:31 +0000 Subject: [PATCH 15/18] 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/`. --- Ruby.gitignore | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Ruby.gitignore b/Ruby.gitignore index b20c5ce6..82aa6fac 100644 --- a/Ruby.gitignore +++ b/Ruby.gitignore @@ -1,23 +1,23 @@ -*.gem -*.rbc -.config -coverage -InstalledFiles +/*.gem +/*.rbc +/.config +/coverage/ +/InstalledFiles /pkg/ -/spec/reports -/test/tmp -/test/version_tmp +/spec/reports/ +/test/tmp/ +/test/version_tmp/ /tmp/ ## Documentation cache and generated files: -/.yardoc -/_yardoc +/.yardoc/ +/_yardoc/ /doc/ -/rdoc +/rdoc/ ## Environment normalisation: -/.bundle -/lib/bundler/man +/.bundle/ +/lib/bundler/man/ # for a library or gem, you might want to ignore these files since the code is # intended to run in multiple environments; otherwise, check them in: @@ -26,4 +26,4 @@ InstalledFiles # .ruby-gemset # unless supporting rvm < 1.11.0 or doing something fancy, ignore this: -.rvmrc +/.rvmrc From ca456f73e42b830dbae55f281a7eb0918944ba28 Mon Sep 17 00:00:00 2001 From: tiredpixel Date: Mon, 11 Nov 2013 21:41:11 +0000 Subject: [PATCH 16/18] 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. --- Ruby.gitignore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Ruby.gitignore b/Ruby.gitignore index 82aa6fac..99e72c12 100644 --- a/Ruby.gitignore +++ b/Ruby.gitignore @@ -1,5 +1,5 @@ -/*.gem -/*.rbc +*.gem +*.rbc /.config /coverage/ /InstalledFiles @@ -26,4 +26,4 @@ # .ruby-gemset # unless supporting rvm < 1.11.0 or doing something fancy, ignore this: -/.rvmrc +.rvmrc From 97dcb890138e142acde385ac4cf7e2df199f0fbf Mon Sep 17 00:00:00 2001 From: Visgean Skeloru Date: Tue, 12 Nov 2013 01:41:29 +0100 Subject: [PATCH 17/18] #473 no need to have specific gitignore for django --- Django.gitignore | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 Django.gitignore diff --git a/Django.gitignore b/Django.gitignore deleted file mode 100644 index 3416fbb3..00000000 --- a/Django.gitignore +++ /dev/null @@ -1,40 +0,0 @@ -# Django stuff: -*.log -*.pot - -# Python stuff: -*.py[cod] - -# C extensions -*.so - -# Packages -*.egg -*.egg-info -dist -build -eggs -parts -bin -var -sdist -develop-eggs -.installed.cfg -lib -lib64 - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox -nosetests.xml - -# Translations -*.mo - -# Mr Developer -.mr.developer.cfg -.project -.pydevproject \ No newline at end of file From 33b416dc000f86ca63cab0dfeaf78f3369a203fd Mon Sep 17 00:00:00 2001 From: Visgean Skeloru Date: Tue, 12 Nov 2013 01:41:53 +0100 Subject: [PATCH 18/18] Update Python.gitignore --- Python.gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Python.gitignore b/Python.gitignore index d2d6f360..e444c74d 100644 --- a/Python.gitignore +++ b/Python.gitignore @@ -33,3 +33,8 @@ nosetests.xml .mr.developer.cfg .project .pydevproject + + +-# Django stuff: + -*.log + -*.pot