From b2a12b717c71b320abdb11dee49003c84342cbe2 Mon Sep 17 00:00:00 2001 From: Arjun Sreedharan Date: Wed, 19 Feb 2014 20:16:17 +0530 Subject: [PATCH 01/32] add downloads/ in Distribution / packaging --- Python.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Python.gitignore b/Python.gitignore index 76f2a469..61119b04 100644 --- a/Python.gitignore +++ b/Python.gitignore @@ -12,6 +12,7 @@ bin/ build/ develop-eggs/ dist/ +downloads/ eggs/ lib/ lib64/ From 53441c0cd6f8bc95a9766084f95dee68d3498700 Mon Sep 17 00:00:00 2001 From: thurask Date: Tue, 10 Jun 2014 15:25:31 -0400 Subject: [PATCH 02/32] Create Momentics.gitignore Ignore debug/release builds (those go in Releases) --- Global/Momentics.gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Global/Momentics.gitignore diff --git a/Global/Momentics.gitignore b/Global/Momentics.gitignore new file mode 100644 index 00000000..35095540 --- /dev/null +++ b/Global/Momentics.gitignore @@ -0,0 +1,3 @@ +# Built files +x86/ +arm/ From 174e4d5178f3b8db224a74de2dc28baec447bc69 Mon Sep 17 00:00:00 2001 From: Ryan Shrum Date: Thu, 12 Jun 2014 11:35:22 -0400 Subject: [PATCH 03/32] Added recommended gitignore rules from Craft Signed-off-by: Ryan Shrum --- CraftCMS.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 CraftCMS.gitignore diff --git a/CraftCMS.gitignore b/CraftCMS.gitignore new file mode 100644 index 00000000..0d0d1339 --- /dev/null +++ b/CraftCMS.gitignore @@ -0,0 +1,5 @@ +.DS_Store + +# Craft Storage (cache) [http://buildwithcraft.com/help/craft-storage-gitignore] +/craft/storage/* +!/craft/storage/logo/* \ No newline at end of file From f380ad40c4bf02111817a6959450429e8b8c8e67 Mon Sep 17 00:00:00 2001 From: thurask Date: Fri, 13 Jun 2014 20:27:05 -0400 Subject: [PATCH 04/32] Add arm-p folder arm-p is another compiled output folder, for device-profile builds --- Global/Momentics.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Global/Momentics.gitignore b/Global/Momentics.gitignore index 35095540..4e8924dc 100644 --- a/Global/Momentics.gitignore +++ b/Global/Momentics.gitignore @@ -1,3 +1,4 @@ # Built files x86/ arm/ +arm-p/ From 65565585ffb94307efa79d5f659f69c33b12ed94 Mon Sep 17 00:00:00 2001 From: Andrew Lambert Date: Thu, 19 Jun 2014 15:14:40 -0700 Subject: [PATCH 05/32] Add REALbasic --- REALbasic.gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 REALbasic.gitignore diff --git a/REALbasic.gitignore b/REALbasic.gitignore new file mode 100644 index 00000000..011a6255 --- /dev/null +++ b/REALbasic.gitignore @@ -0,0 +1,9 @@ +#RB & Xojo temp files/folders +Builds* +*.debug +*.debug.app +Debug*.exe +Debug*/Debug*.exe +Debug*/Debug*\ Libs +*.rbuistate +*.obsolete \ No newline at end of file From ce45fd33a6f1d283743e8ccd0d6023d2e59b14cc Mon Sep 17 00:00:00 2001 From: Ryan Shrum Date: Tue, 24 Jun 2014 10:01:43 -0400 Subject: [PATCH 06/32] Removing .DS_Store rule as it is included in global rules Signed-off-by: Ryan Shrum --- CraftCMS.gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/CraftCMS.gitignore b/CraftCMS.gitignore index 0d0d1339..a70d4772 100644 --- a/CraftCMS.gitignore +++ b/CraftCMS.gitignore @@ -1,5 +1,3 @@ -.DS_Store - # Craft Storage (cache) [http://buildwithcraft.com/help/craft-storage-gitignore] /craft/storage/* !/craft/storage/logo/* \ No newline at end of file From 9802c2cfd81be1a3dfadf976d9456e5a073081b4 Mon Sep 17 00:00:00 2001 From: Sam Duke Date: Mon, 14 Jul 2014 12:21:40 +0100 Subject: [PATCH 07/32] Update JetBrains.gitignore To clarify when to ignore/include *.imls as per https://intellij-support.jetbrains.com/entries/23393067 also added optionals from the same --- Global/JetBrains.gitignore | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 343bec29..157f7501 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -1,5 +1,7 @@ # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm +## For directory vs file based set-ups, see: https://intellij-support.jetbrains.com/entries/23393067 + ## Directory-based project format .idea/ # if you remove the above rule, at least ignore user-specific stuff: @@ -10,8 +12,12 @@ # .idea/dataSources.xml # .idea/sqlDataSources.xml # .idea/dynamic.xml +# optionals: +# .idea/gradle.xml +# .idea/dictionaries +# .idea/libraries -## File-based project format +## File-based project format - remove if using the above *.ipr *.iml *.iws From d4e192ffee77aaa40ec43e0f7f70d912d74e4705 Mon Sep 17 00:00:00 2001 From: Sam Duke Date: Tue, 15 Jul 2014 11:57:37 +0100 Subject: [PATCH 08/32] Updated following feedback removed the iml filter - this is my current best understanding of the docs, but I'm still unsure --- Global/JetBrains.gitignore | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 157f7501..f3d8960d 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -1,25 +1,22 @@ # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm -## For directory vs file based set-ups, see: https://intellij-support.jetbrains.com/entries/23393067 - ## Directory-based project format .idea/ # if you remove the above rule, at least ignore user-specific stuff: # .idea/workspace.xml # .idea/tasks.xml +# .idea/dictionaries # and these sensitive or high-churn files: # .idea/dataSources.ids # .idea/dataSources.xml # .idea/sqlDataSources.xml # .idea/dynamic.xml -# optionals: +# and, if using gradle:: # .idea/gradle.xml -# .idea/dictionaries # .idea/libraries -## File-based project format - remove if using the above +## File-based project format *.ipr -*.iml *.iws ## Additional for IntelliJ From 7ce5fbcea586cdbf3e3a46c5b231f6d1c07f60e1 Mon Sep 17 00:00:00 2001 From: Sam Duke Date: Tue, 15 Jul 2014 12:06:15 +0100 Subject: [PATCH 09/32] change iml guess that root iml needs to be ignored and others need to be shared --- Global/JetBrains.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index f3d8960d..333bdd26 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -2,6 +2,7 @@ ## Directory-based project format .idea/ +/*.iml # if you remove the above rule, at least ignore user-specific stuff: # .idea/workspace.xml # .idea/tasks.xml From 6f167b8992f137c6b878094df09f65978c76d63c Mon Sep 17 00:00:00 2001 From: Fabian Heredia Montiel Date: Fri, 18 Jul 2014 16:11:42 -0500 Subject: [PATCH 10/32] Add ignores for bower-rails bower-rails integrates bower.io into Rails, it allows you to have everything in a Bowerfile and install all vendor assets easily. --- Rails.gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Rails.gitignore b/Rails.gitignore index d9474d9d..4fae5d0a 100644 --- a/Rails.gitignore +++ b/Rails.gitignore @@ -24,3 +24,8 @@ config/secrets.yml # unless supporting rvm < 1.11.0 or doing something fancy, ignore this: .rvmrc + +# if using bower-rails ignore default bower_components path bower.json files +/vendor/assets/bower_components +*.bowerrc +bower.json From a27e91ec008ca7e40af427724c78a46a7b47a15e Mon Sep 17 00:00:00 2001 From: ChemiKhazi Date: Sat, 26 Jul 2014 18:40:52 +0800 Subject: [PATCH 11/32] Update Unity.gitignore Ignore the build directory in case a Unity build is initiated in the project. --- Unity.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Unity.gitignore b/Unity.gitignore index feb47395..9d8e1156 100644 --- a/Unity.gitignore +++ b/Unity.gitignore @@ -1,6 +1,7 @@ [Ll]ibrary/ [Tt]emp/ [Oo]bj/ +[Bb]uild/ # Autogenerated VS/MD solution and project files /*.csproj From 9e35fe9b2f2b6cb861ca160ca56bb7a41d7e53f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Haberth=C3=BCr?= Date: Tue, 29 Jul 2014 11:40:15 +0200 Subject: [PATCH 12/32] (TeX) Exclude files generated by using backref. When doing \usepackage[backref]{hyperref} the pages of the references are shown in the bibliography. Those files can be safely ignored. Info: http://tex.stackexchange.com/a/7772/828 --- TeX.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/TeX.gitignore b/TeX.gitignore index c5d2e1c3..6938eea7 100644 --- a/TeX.gitignore +++ b/TeX.gitignore @@ -20,6 +20,7 @@ *.blg *-blx.aux *-blx.bib +*.brf *.run.xml ## Build tool auxiliary files: From d91e30aca91a25a3bcf1e05d8a66485e01e7a8ad Mon Sep 17 00:00:00 2001 From: Eddie Abou-Jaoude Date: Thu, 31 Jul 2014 07:42:20 +0100 Subject: [PATCH 13/32] Updated Zend Framework gitignore as per docs ``` data/: This directory provides a place to store application data that is volatile and possibly temporary. The disturbance of data in this directory might cause the application to fail. Also, the information in this directory may or may not be committed to a subversion repository. Examples of things in this directory are session files, cache files, sqlite databases, logs and indexes. ``` As per docs... http://framework.zend.com/manual/2.3/en/ref/project.structure.html --- ZendFramework.gitignore | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ZendFramework.gitignore b/ZendFramework.gitignore index cd248f53..005ba82b 100644 --- a/ZendFramework.gitignore +++ b/ZendFramework.gitignore @@ -3,18 +3,18 @@ composer.phar vendor/ # Local configs -config/autoload/*local.php +config/autoload/*.local.php # Binary gettext files *.po # Data -log/ -logs/ -cache/ +data/logs/ +data/cache/ +data/sessions/ +data/tmp/ temp/ -tmp/ -# ZF1 +# Legacy ZF1 demos/ extras/documentation From 689f3e929cb125eac935922fe66daa04e32f5861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=AFeul=20Rouquette?= Date: Thu, 31 Jul 2014 15:45:16 +0200 Subject: [PATCH 14/32] eledmac 1.12/ elepar 1.8 files ".eledsec" --- TeX.gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/TeX.gitignore b/TeX.gitignore index 8ffe860e..bbf72547 100644 --- a/TeX.gitignore +++ b/TeX.gitignore @@ -50,6 +50,12 @@ *.[1-9]R *.[1-9][0-9]R *.[1-9][0-9][0-9]R +*.eledsec[1-9] +*.eledsec[1-9]R +*.eledsec[1-9][0-9] +*.eledsec[1-9][0-9]R +*.eledsec[1-9][0-9][0-9] +*.eledsec[1-9][0-9][0-9]R # glossaries *.acn From 20cf6d5dcd5411f950d78d0007ae2be53474978b Mon Sep 17 00:00:00 2001 From: Mads Kristensen Date: Mon, 4 Aug 2014 10:09:06 -0700 Subject: [PATCH 15/32] Adding *.publishproj to ignore This files is generated by Visual Studio 2013 and should be ignored. --- VisualStudio.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 5b4334f5..fd5204b5 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -128,6 +128,7 @@ publish/ # TODO: Comment the next line if you want to checkin your web deploy settings # but database connection strings (with potential passwords) will be unencrypted *.pubxml +*.publishproj # NuGet Packages *.nupkg From 5521a828aad4bb6c8d01c9fc652c46fa56586cda Mon Sep 17 00:00:00 2001 From: Josh Whaley Date: Wed, 13 Aug 2014 10:52:00 -0400 Subject: [PATCH 16/32] Update Node.gitignore Updated link for the dependency directory from [this](https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git) to [this](https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-). --- Node.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Node.gitignore b/Node.gitignore index a4af05a6..59d842ba 100644 --- a/Node.gitignore +++ b/Node.gitignore @@ -21,7 +21,7 @@ build/Release # Dependency directory # Commenting this out is preferred by some people, see -# https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git +# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git- node_modules # Users Environment Variables From fd5fabb39e66c0335b86ccf218ca3d5b0df7b278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Demette?= Date: Wed, 13 Aug 2014 22:55:43 +0200 Subject: [PATCH 17/32] Typo fix + Plugin configuration + UI specific file --- Global/JetBrains.gitignore | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 333bdd26..311a7322 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -12,9 +12,13 @@ # .idea/dataSources.xml # .idea/sqlDataSources.xml # .idea/dynamic.xml -# and, if using gradle:: +# and this UI specific file +# .idea/uiDesigner.xml +# and, if using gradle: # .idea/gradle.xml # .idea/libraries +# and, if using Mongo Explorer plugin +# .idea/mongoSettings.xml ## File-based project format *.ipr @@ -30,4 +34,4 @@ out/ atlassian-ide-plugin.xml # generated by Crashlytics plugin (for Android Studio and Intellij) -com_crashlytics_export_strings.xml +com_crashlytics_export_strings.xml \ No newline at end of file From e36d2c084585f53e120ca6e82176a09bbfcb158b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Jagie=C5=82=C5=82o?= Date: Fri, 15 Aug 2014 13:16:24 +0200 Subject: [PATCH 18/32] Remove trailing space --- Python.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Python.gitignore b/Python.gitignore index efbe7aab..00039fa8 100644 --- a/Python.gitignore +++ b/Python.gitignore @@ -22,7 +22,7 @@ var/ *.egg # PyInstaller -# Usually these files are written by a python script from a template +# Usually these files are written by a python script from a template # before PyInstaller builds the exe, so as to inject date/other infos into it. *.manifest *.spec From 0c6f7fd69afe223e4311a5c15c51ed0aef0f0f48 Mon Sep 17 00:00:00 2001 From: No0ne Date: Mon, 18 Aug 2014 09:26:40 +0200 Subject: [PATCH 19/32] ignoring new Magento 1.9 default theme --- Magento.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Magento.gitignore b/Magento.gitignore index fce27ad8..ad84efe3 100644 --- a/Magento.gitignore +++ b/Magento.gitignore @@ -4,6 +4,7 @@ app/code/community/Cm/ app/code/core/ app/design/adminhtml/default/default/ app/design/frontend/base/ +app/design/frontend/rwd/ app/design/frontend/default/blank/ app/design/frontend/default/default/ app/design/frontend/default/iphone/ @@ -106,6 +107,7 @@ shell/log.php skin/adminhtml/default/default/ skin/adminhtml/default/enterprise skin/frontend/base/ +skin/frontend/rwd/ skin/frontend/default/blank/ skin/frontend/default/blue/ skin/frontend/default/default/ From 1f6d881044af0187ab6fe431dca0e7008e8cbd2b Mon Sep 17 00:00:00 2001 From: gazebodude Date: Tue, 19 Aug 2014 14:11:11 +1000 Subject: [PATCH 20/32] Create LyX.gitignore Ignores *.lyx~ (crash recovery) and *.lyx# (timed autosave) files generated by LyX - the document processor. --- Global/LyX.gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Global/LyX.gitignore diff --git a/Global/LyX.gitignore b/Global/LyX.gitignore new file mode 100644 index 00000000..8efe0195 --- /dev/null +++ b/Global/LyX.gitignore @@ -0,0 +1,4 @@ +# Ignore LyX backup and autosave files +# http://www.lyx.org/ +*.lyx~ +*.lyx# From b9d160ea0f5065290af819e37832835647afd066 Mon Sep 17 00:00:00 2001 From: Attila Szeremi Date: Thu, 21 Aug 2014 13:26:02 +0100 Subject: [PATCH 21/32] Fixed binary gettext files rule: .po -> .mo --- ZendFramework.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZendFramework.gitignore b/ZendFramework.gitignore index 005ba82b..3fbc9733 100644 --- a/ZendFramework.gitignore +++ b/ZendFramework.gitignore @@ -6,7 +6,7 @@ vendor/ config/autoload/*.local.php # Binary gettext files -*.po +*.mo # Data data/logs/ From c3751cac16fbc20a626a6dfa901e7eb05b478f7a Mon Sep 17 00:00:00 2001 From: malheleco Date: Thu, 21 Aug 2014 20:45:30 +0200 Subject: [PATCH 22/32] add shortcut files --- Global/Windows.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Global/Windows.gitignore b/Global/Windows.gitignore index 41968b07..a0d31452 100644 --- a/Global/Windows.gitignore +++ b/Global/Windows.gitignore @@ -13,3 +13,6 @@ $RECYCLE.BIN/ *.msi *.msm *.msp + +# Windows shortcuts +*.lnk From bd4cc85a9e8eba7161ce0504670e4d286e2c3642 Mon Sep 17 00:00:00 2001 From: John Haugeland Date: Fri, 22 Aug 2014 01:15:23 -0700 Subject: [PATCH 23/32] Add ebin, rel example, concrete dev mode, .rebar --- Erlang.gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Erlang.gitignore b/Erlang.gitignore index 0c20ff0d..8e46d5a0 100644 --- a/Erlang.gitignore +++ b/Erlang.gitignore @@ -4,3 +4,7 @@ deps *.beam *.plt erl_crash.dump +ebin +rel/example_project +.concrete/DEV_MODE +.rebar From 619a395e1e2f4c766417180801c19d850eb1f812 Mon Sep 17 00:00:00 2001 From: Andreas Grosse Date: Sun, 24 Aug 2014 10:27:28 +0200 Subject: [PATCH 24/32] added converted-to-files --- TeX.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/TeX.gitignore b/TeX.gitignore index 6938eea7..94308c01 100644 --- a/TeX.gitignore +++ b/TeX.gitignore @@ -9,6 +9,7 @@ ## Intermediate documents: *.dvi +*-converted-to.* # these rules might exclude image files for figures etc. # *.ps # *.eps From be406770284bd4ca1b5a0fa686c6dfcac457157e Mon Sep 17 00:00:00 2001 From: Oliver Keyes Date: Mon, 25 Aug 2014 16:08:38 -0400 Subject: [PATCH 25/32] Add *.Rproj for RStudio users RStudio - the only real R IDE, and an incredibly commonly used environment for R, particularly since it has git support - uses .Rproj files in projects, that follow the pattern projectname.Rproj. Adding *.Rproj to capture these and exclude them. --- R.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/R.gitignore b/R.gitignore index 9a1509d5..ea01b082 100644 --- a/R.gitignore +++ b/R.gitignore @@ -6,3 +6,6 @@ # R data files from past sessions .Rdata + +# RStudio files +*.Rproj From 3e36b5a353c5c2b3d717659766dfa40e9b1b5c79 Mon Sep 17 00:00:00 2001 From: Pengyu CHEN Date: Wed, 27 Aug 2014 13:36:18 +0800 Subject: [PATCH 26/32] added: rules for ingnoring precompiled headers for C/C++ --- C++.gitignore | 4 ++++ C.gitignore | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/C++.gitignore b/C++.gitignore index 35e15598..b8bd0267 100644 --- a/C++.gitignore +++ b/C++.gitignore @@ -4,6 +4,10 @@ *.o *.obj +# Precompiled Headers +*.gch +*.pch + # Compiled Dynamic libraries *.so *.dylib diff --git a/C.gitignore b/C.gitignore index c46c9256..edf6645d 100644 --- a/C.gitignore +++ b/C.gitignore @@ -4,6 +4,10 @@ *.obj *.elf +# Precompiled Headers +*.gch +*.pch + # Libraries *.lib *.a From 57f117945e43e88651b766c548ee2fda7710f0a7 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Mon, 1 Sep 2014 14:56:15 +1000 Subject: [PATCH 27/32] Tidy up the JetBrains comments Amends #1165 --- Global/JetBrains.gitignore | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 311a7322..2ac36702 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -1,37 +1,44 @@ # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm -## Directory-based project format -.idea/ /*.iml -# if you remove the above rule, at least ignore user-specific stuff: + +## Directory-based project format: +.idea/ +# if you remove the above rule, at least ignore the follwing: + +# User-specific stuff: # .idea/workspace.xml # .idea/tasks.xml # .idea/dictionaries -# and these sensitive or high-churn files: + +# Sensitive or high-churn files: # .idea/dataSources.ids # .idea/dataSources.xml # .idea/sqlDataSources.xml # .idea/dynamic.xml -# and this UI specific file # .idea/uiDesigner.xml -# and, if using gradle: + +# Gradle: # .idea/gradle.xml # .idea/libraries -# and, if using Mongo Explorer plugin + +# Mongo Explorer plugin: # .idea/mongoSettings.xml -## File-based project format +## File-based project format: *.ipr *.iws -## Additional for IntelliJ +## Plugin-specific files: + +# IntelliJ out/ -# generated by mpeltonen/sbt-idea plugin +# mpeltonen/sbt-idea plugin .idea_modules/ -# generated by JIRA plugin +# JIRA plugin atlassian-ide-plugin.xml -# generated by Crashlytics plugin (for Android Studio and Intellij) -com_crashlytics_export_strings.xml \ No newline at end of file +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml From 8391230157d4e5a0989352d08e73c93f6f94be95 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Mon, 1 Sep 2014 15:05:53 +1000 Subject: [PATCH 28/32] Rename RB to reflect current software naming --- REALbasic.gitignore => Xojo.gitignore | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename REALbasic.gitignore => Xojo.gitignore (61%) diff --git a/REALbasic.gitignore b/Xojo.gitignore similarity index 61% rename from REALbasic.gitignore rename to Xojo.gitignore index 011a6255..f832c86a 100644 --- a/REALbasic.gitignore +++ b/Xojo.gitignore @@ -1,4 +1,5 @@ -#RB & Xojo temp files/folders +# Xojo (formerly REALbasic and Real Studio) + Builds* *.debug *.debug.app @@ -6,4 +7,4 @@ Debug*.exe Debug*/Debug*.exe Debug*/Debug*\ Libs *.rbuistate -*.obsolete \ No newline at end of file +*.obsolete From a383e5508fea83d21c7cd831775021797699ab51 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Mon, 1 Sep 2014 15:15:27 +1000 Subject: [PATCH 29/32] Remove legacy Symfony template Quoting from http://symfony.com/legacy The symfony 1.x branch of the framework started in 2005 and the latest stable version and long term support release is symfony 1.4. As of November 2012, symfony 1.x is not maintained anymore and you are encouraged to have a look at Symfony2 for any new projects. --- Symfony.gitignore | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 Symfony.gitignore diff --git a/Symfony.gitignore b/Symfony.gitignore deleted file mode 100644 index e5d08cbe..00000000 --- a/Symfony.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -cache/* -log/* -web/uploads/* -config/databases.yml -config/propel.ini -data/sql/* -lib/filter/doctrine/base/Base* -lib/filter/doctrine/*Plugin/base/Base* -lib/form/doctrine/base/Base* -lib/form/doctrine/*Plugin/base/Base* -lib/model/doctrine/base/Base* -lib/model/doctrine/*Plugin/base/Base* -lib/model/om/* -lib/model/map/* -web/*Plugin/* From 2d997dd2faf1ef9cc2ecb5ceb148349def3b783a Mon Sep 17 00:00:00 2001 From: kun Date: Mon, 1 Sep 2014 02:22:33 -0600 Subject: [PATCH 30/32] Update Dart.gitignore Add in rule for .buildlog --- Dart.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Dart.gitignore b/Dart.gitignore index 74a3439f..2ceb8eed 100644 --- a/Dart.gitignore +++ b/Dart.gitignore @@ -1,6 +1,7 @@ # Don’t commit the following directories created by pub. build/ packages/ +.buildlog # Or the files created by dart2js. *.dart.js From 5e34ab0bc2c0aebc0af0ee1419671043734fc346 Mon Sep 17 00:00:00 2001 From: Nic Wortel Date: Mon, 1 Sep 2014 10:42:47 +0200 Subject: [PATCH 31/32] Rename Symfony2.gitignore to Symfony.gitignore The old Symfony.gitignore has been removed (a383e55) as Symfony 1 is no longer supported. --- Symfony2.gitignore => Symfony.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Symfony2.gitignore => Symfony.gitignore (100%) diff --git a/Symfony2.gitignore b/Symfony.gitignore similarity index 100% rename from Symfony2.gitignore rename to Symfony.gitignore From 2626eee811f99542d35eb474d30902e3db480cfc Mon Sep 17 00:00:00 2001 From: Nic Wortel Date: Mon, 1 Sep 2014 10:50:33 +0200 Subject: [PATCH 32/32] Update Symfony.gitignore to support Symfony3 Symfony3 (and some versions of Symfony2) come with a new directory structure. This updated version of Symfony.gitignore supports this new directory structure as well as the old one. --- Symfony.gitignore | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Symfony.gitignore b/Symfony.gitignore index d6e334bb..636b6f8e 100644 --- a/Symfony.gitignore +++ b/Symfony.gitignore @@ -1,16 +1,25 @@ -# Cache and logs +# Cache and logs (Symfony2) /app/cache/* /app/logs/* !app/cache/.gitkeep !app/logs/.gitkeep +# Cache and logs (Symfony3) +/var/cache/* +/var/logs/* +!var/cache/.gitkeep +!var/logs/.gitkeep + # Parameters /app/config/parameters.yml /app/config/parameters.ini # Managed by Composer /app/bootstrap.php.cache -/bin/ +/var/bootstrap.php.cache +/bin/* +!bin/console +!bin/symfony_requirements /vendor/ # Assets and user uploads @@ -19,6 +28,7 @@ # PHPUnit /app/phpunit.xml +/phpunit.xml # Composer PHAR /composer.phar