From ff6fa231f96283ad30c63a1278966b7e6725d5fa Mon Sep 17 00:00:00 2001 From: Jens Jahnke Date: Tue, 12 Nov 2013 09:37:03 +0100 Subject: [PATCH 01/51] 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. --- SugarCRM.gitignore | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore index c2d893a9..28668ff1 100644 --- a/SugarCRM.gitignore +++ b/SugarCRM.gitignore @@ -1,33 +1,21 @@ ## SugarCRM # Ignore custom .htaccess stuff. /.htaccess -# Ignore large parts of the annoying cache directory without breaking things. -cache/csv/* -cache/dashlets/* -cache/diagnostic/* -cache/dynamic_fields/* -cache/feeds/* -cache/import/* -cache/include/* -cache/jsLanguage/* -cache/modules/* -!cache/modules/emails -!cache/modules/Emails -cache/pdf/* -cache/smarty/cache/* -cache/smarty/templates_c/* -cache/themes/* -cache/xml/* +# Ignore the cache directory completely. ATTENTION! This will break things! +/cache/* # Ignore some files and directories from the custom directory. -custom/history/* -custom/modulebuilder/* -custom/working/* -custom/modules/*/Ext/ -custom/application/Ext/* +/custom/history/* +/custom/modulebuilder/* +/custom/working/* +/custom/modules/*/Ext/ +/custom/application/Ext/* # Custom configuration should also be ignored. /config.php /config_override.php # The silent upgrade scripts aren't needed. -silentUpgrade*.php +/silentUpgrade*.php # Logs files can safely be ignored. *.log +# Ignore the new upload directories. +/upload/* +/upload_backup/* From b34ccb38532215b0d9f86955eff1f2f00f0e8d86 Mon Sep 17 00:00:00 2001 From: Jens Jahnke Date: Tue, 12 Nov 2013 12:20:11 +0100 Subject: [PATCH 02/51] Adapted the ignored directories to use `dir/` instead of `dir/*` --- SugarCRM.gitignore | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore index 28668ff1..07ee1ce5 100644 --- a/SugarCRM.gitignore +++ b/SugarCRM.gitignore @@ -2,13 +2,13 @@ # Ignore custom .htaccess stuff. /.htaccess # Ignore the cache directory completely. ATTENTION! This will break things! -/cache/* +/cache/ # Ignore some files and directories from the custom directory. -/custom/history/* -/custom/modulebuilder/* -/custom/working/* +/custom/history/ +/custom/modulebuilder/ +/custom/working/ /custom/modules/*/Ext/ -/custom/application/Ext/* +/custom/application/Ext/ # Custom configuration should also be ignored. /config.php /config_override.php @@ -17,5 +17,5 @@ # Logs files can safely be ignored. *.log # Ignore the new upload directories. -/upload/* -/upload_backup/* +/upload/ +/upload_backup/ From 1c580917237baddaf69ec47cd231c04a0808e4ce Mon Sep 17 00:00:00 2001 From: Jens Jahnke Date: Wed, 27 Nov 2013 17:30:57 +0100 Subject: [PATCH 03/51] Explanations for ignoring the cache directory I wrote a more explanatory comment regarding the cache directory and why it is ignored. --- SugarCRM.gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore index 07ee1ce5..842c3ec5 100644 --- a/SugarCRM.gitignore +++ b/SugarCRM.gitignore @@ -1,7 +1,11 @@ ## SugarCRM # Ignore custom .htaccess stuff. /.htaccess -# Ignore the cache directory completely. ATTENTION! This will break things! +# Ignore the cache directory completely. +# This will break the current behaviour. Which was often leading to +# the misuse of the repository as backup replacement. +# For development the cache directory can be safely ignored and +# therefore it is ignored. /cache/ # Ignore some files and directories from the custom directory. /custom/history/ From c65905abd2cc57de72110972ddd7899e1e280587 Mon Sep 17 00:00:00 2001 From: Richard Astbury Date: Fri, 29 Nov 2013 20:22:42 +0000 Subject: [PATCH 04/51] added node_modules --- VisualStudio.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index c273fc5c..717d3092 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -142,6 +142,7 @@ ClientBin/ *.[Pp]ublish.xml *.pfx *.publishsettings +node_modules/ # RIA/Silverlight projects Generated_Code/ From 402607d59360bf3d3d3128b154c727080781259d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Niederges=C3=A4=C3=9F?= Date: Thu, 12 Dec 2013 16:10:56 +0100 Subject: [PATCH 05/51] Update to Magento 1.8.x --- Magento.gitignore | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Magento.gitignore b/Magento.gitignore index 7eac4663..db650756 100644 --- a/Magento.gitignore +++ b/Magento.gitignore @@ -1,6 +1,7 @@ .modgit/ app/code/community/Find/ app/code/community/Phoenix/ +app/code/community/Cm/ app/code/core/ app/design/adminhtml/default/default/ app/design/adminhtml/default/find/ @@ -33,6 +34,7 @@ app/etc/modules/Mage_Weee.xml app/etc/modules/Mage_Widget.xml app/etc/modules/Mage_XmlConnect.xml app/etc/modules/Phoenix_Moneybookers.xml +app/etc/modules/Cm_RedisSession.xml app/etc/config.xml app/etc/enterprise.xml app/etc/local.xml.additional @@ -77,6 +79,9 @@ lib/PEAR/ lib/phpseclib/ lib/Varien/ lib/Zend/ +lib/Cm/ +lib/Credis/ +lib/Magento/ LICENSE_AFL.txt LICENSE.html LICENSE.txt @@ -89,7 +94,7 @@ media/.htaccess media/import/ media/xmlconnect/ media/catalog/product/cache/ - +api.php nbproject/ pear pear/ From 33dd88ab847ae615028c9981d6e12b53cbcd6799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Evandro=20Leopoldino=20Gon=C3=A7alves?= Date: Sat, 14 Dec 2013 12:07:26 -0200 Subject: [PATCH 06/51] Update Python.gitignore --- Python.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Python.gitignore b/Python.gitignore index 50a87264..3a025deb 100644 --- a/Python.gitignore +++ b/Python.gitignore @@ -6,6 +6,9 @@ __pycache__/ *.so # Distribution / packaging +.Python +env/ +include/ bin/ build/ develop-eggs/ From 1d724a505e84e153183fa02474bdeb1d4641b4f2 Mon Sep 17 00:00:00 2001 From: andrewwutw Date: Tue, 17 Dec 2013 15:06:57 +0800 Subject: [PATCH 07/51] Added SCons.gitignore --- SCons.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 SCons.gitignore diff --git a/SCons.gitignore b/SCons.gitignore new file mode 100644 index 00000000..39d9743a --- /dev/null +++ b/SCons.gitignore @@ -0,0 +1,2 @@ +# for projects that use SCons for building: http://http://www.scons.org/ +.sconsign.dblite From 5f10e35598807dc8778276459421b7454df8bede Mon Sep 17 00:00:00 2001 From: Arinto Murdopo Date: Wed, 25 Dec 2013 07:35:59 +0800 Subject: [PATCH 08/51] Add "dist" and ".cache" folders for Play 2.2.x Link: http://www.playframework.com/documentation/2.2.x/Anatomy --- PlayFramework.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PlayFramework.gitignore b/PlayFramework.gitignore index ed27485a..3bf02289 100644 --- a/PlayFramework.gitignore +++ b/PlayFramework.gitignore @@ -15,3 +15,5 @@ test-result server.pid *.iml *.eml +dist +.cache From 791e8ed0aea099348c949c0b8792cee513b40226 Mon Sep 17 00:00:00 2001 From: Arinto Murdopo Date: Wed, 25 Dec 2013 07:48:34 +0800 Subject: [PATCH 09/51] Add output directory of sbteclipse plugin, which is ".target" directory. --- Global/Eclipse.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore index 72727761..984a6eff 100644 --- a/Global/Eclipse.gitignore +++ b/Global/Eclipse.gitignore @@ -23,5 +23,8 @@ local.properties # PDT-specific .buildpath +# sbteclipse plugin +.target + # TeXlipse plugin .texlipse From 8209359a888a31b1fd94a4e5ef0524ea6b61e25c Mon Sep 17 00:00:00 2001 From: Tim Perry Date: Thu, 26 Dec 2013 23:53:21 +0000 Subject: [PATCH 10/51] Ignore grunt and lcov build files in Node projects --- Node.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Node.gitignore b/Node.gitignore index c84ba258..cfbee8d8 100644 --- a/Node.gitignore +++ b/Node.gitignore @@ -1,4 +1,5 @@ lib-cov +lcov.info *.seed *.log *.csv @@ -11,5 +12,6 @@ pids logs results build +.grunt node_modules From 68c34eff0ec3ce9b32051414be06a69eee9e44ce Mon Sep 17 00:00:00 2001 From: Stijn-Flipper Date: Sat, 28 Dec 2013 17:16:38 +0100 Subject: [PATCH 11/51] also ignore sensitive configuration data --- WordPress.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/WordPress.gitignore b/WordPress.gitignore index 8e22e0e2..017e1936 100644 --- a/WordPress.gitignore +++ b/WordPress.gitignore @@ -10,3 +10,4 @@ sitemap.xml wp-content/cache/ wp-content/backups/ sitemap.xml.gz +wp-config.php From e0077c3900b074f0e3bfe3668cd2c305726d4979 Mon Sep 17 00:00:00 2001 From: Mickey Puri Date: Wed, 1 Jan 2014 15:19:20 +0000 Subject: [PATCH 12/51] fixed handling of nuget packages --- VisualStudio.gitignore | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 15ecea93..874a9735 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -16,9 +16,6 @@ bld/ [Bb]in/ [Oo]bj/ -# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets -!packages/*/build/ - # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* @@ -119,10 +116,14 @@ publish/ # NuGet Packages Directory ## TODO: If you have NuGet Package Restore enabled, uncomment the next line -#packages/ +#packages/* ## TODO: If the tool you use requires repositories.config, also uncomment the next line #!packages/repositories.config +# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets +# This line needs to be after the ignore of the build folder (and the packages folder if the line above has been uncommented) +!packages/build/ + # Windows Azure Build Output csx/ *.build.csdef From 446ba8454df37bd49361c2e44c592e393b0ddc09 Mon Sep 17 00:00:00 2001 From: "Stuart P. Bentley" Date: Thu, 2 Jan 2014 16:51:35 -0800 Subject: [PATCH 13/51] Update Cloud9.gitignore The next version of Cloud9 will use a top-level .c9 folder in the workspace for settings and metadata. --- Global/Cloud9.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Global/Cloud9.gitignore b/Global/Cloud9.gitignore index b9f8a369..3f4384df 100644 --- a/Global/Cloud9.gitignore +++ b/Global/Cloud9.gitignore @@ -1,2 +1,3 @@ # Cloud9 IDE - http://c9.io .c9revisions +.c9 From 808d28fab19c356996b017c3c5d5cd6f9f4cebc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Evandro=20Leopoldino=20Gon=C3=A7alves?= Date: Tue, 7 Jan 2014 15:56:17 -0200 Subject: [PATCH 14/51] Update Python.gitignore --- Python.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Python.gitignore b/Python.gitignore index 3a025deb..76f2a469 100644 --- a/Python.gitignore +++ b/Python.gitignore @@ -8,7 +8,6 @@ __pycache__/ # Distribution / packaging .Python env/ -include/ bin/ build/ develop-eggs/ From a2f11b61c37df6eeda7f5c5487a0c8397530d756 Mon Sep 17 00:00:00 2001 From: Dan Lister Date: Tue, 14 Jan 2014 10:29:02 +0000 Subject: [PATCH 15/51] Create Umbraco.gitignore --- Umbraco.gitignore | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 Umbraco.gitignore diff --git a/Umbraco.gitignore b/Umbraco.gitignore new file mode 100644 index 00000000..bafe85f7 --- /dev/null +++ b/Umbraco.gitignore @@ -0,0 +1,51 @@ +# Ignore Visual Studio and system files +*.diff +*.err +*.orig +*.obj +*.pdb +*.user +*.aps +*.pch +*.vspscc +*.vssscc +*_i.c +*_p.c +*.ncb +*.suo +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +*.lib +*.sbr +*.scc +*.resharper +*.rej +*.swo +*.swp +*.DS_Store +*.[Pp]ublish.xml + +# Ignore Visual Studio and plugin folders +[Bb]in +[Dd]ebug +[Oo]bj/ +[Rr]elease +[Pp]review +[Tt]humbs.db +[Tt]est[Rr]esult* +[Bb]uild[Ll]og.* +_ReSharper + +# Ignore Umbraco folders (Generated folders created by Umbraco) +ClientDependency/ +TEMP/ +Logs/ +Cached/ +ExamineIndexes/ + +# Ignore Umbraco content cache file +umbraco.config From 7e2dc593fe8461e24f00ae5d8b9f4fb2eec90df0 Mon Sep 17 00:00:00 2001 From: "Borders, Casey" Date: Thu, 16 Jan 2014 14:48:52 -0500 Subject: [PATCH 16/51] Update Unity gitignore --- Unity.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Unity.gitignore b/Unity.gitignore index 00514587..2ed4ccca 100644 --- a/Unity.gitignore +++ b/Unity.gitignore @@ -8,4 +8,5 @@ /*.sln /*.suo /*.user +/*.userprefs /*.pidb From 631f8760c6890dd9df43dbaf52a56f2968bd36c3 Mon Sep 17 00:00:00 2001 From: Frieder Bluemle Date: Thu, 16 Jan 2014 15:29:58 -0800 Subject: [PATCH 17/51] Improve Android .gitignore comments --- Android.gitignore | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Android.gitignore b/Android.gitignore index 927ef517..64d3c976 100644 --- a/Android.gitignore +++ b/Android.gitignore @@ -1,18 +1,18 @@ -# built application files +# Built application files *.apk *.ap_ -# files for the dex VM +# Files for the Dalvik VM *.dex # Java class files *.class -# generated files +# Generated files bin/ gen/ -# Ignore gradle files +# Gradle files .gradle/ build/ From 21d2f7e1d617474723a1abc28cd8a1686ee2de17 Mon Sep 17 00:00:00 2001 From: cknoblauch Date: Fri, 17 Jan 2014 17:22:59 -0200 Subject: [PATCH 18/51] Update Grails.gitignore to include default files Only files under /web-app/WEB-INF/classes (build output) should be ignored by Git. Grails generates a few default (unchanging) files (applicationContext.xml, sitemesh.xml, a bunch of *.tld) that need to be there for some plugins to function properly (e.g., grails war). --- Grails.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Grails.gitignore b/Grails.gitignore index b827da05..083b60f3 100644 --- a/Grails.gitignore +++ b/Grails.gitignore @@ -1,7 +1,7 @@ # .gitignore for Grails 1.2 and 1.3 # web application files -/web-app/WEB-INF +/web-app/WEB-INF/classes # IDE support files /.classpath From 61422490d3f51f4b62868acfcfe52a01a8c41b6e Mon Sep 17 00:00:00 2001 From: Bananeweizen Date: Sat, 18 Jan 2014 10:29:50 +0100 Subject: [PATCH 19/51] gitignore VM crash logs --- Java.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Java.gitignore b/Java.gitignore index 009ce166..32858aad 100644 --- a/Java.gitignore +++ b/Java.gitignore @@ -7,3 +7,6 @@ *.jar *.war *.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* From 06bb90e532d69340c12f799bfb99fe8330eebc16 Mon Sep 17 00:00:00 2001 From: Robert Holman Date: Wed, 22 Jan 2014 16:11:28 -0600 Subject: [PATCH 20/51] Added .gitignore for the DM language. --- DM.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 DM.gitignore diff --git a/DM.gitignore b/DM.gitignore new file mode 100644 index 00000000..34f782a7 --- /dev/null +++ b/DM.gitignore @@ -0,0 +1,5 @@ +*.dmb +*.rsc +*.int +*.lk +*.zip \ No newline at end of file From 41b324bd0a0ca336f7b9bf028fc6ccbd67c44225 Mon Sep 17 00:00:00 2001 From: fredgate Date: Tue, 28 Jan 2014 10:34:54 +0100 Subject: [PATCH 21/51] Add ignore for web workbench add-on (sass files). --- VisualStudio.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 86b1b906..60c6c27c 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -94,6 +94,9 @@ _NCrunch_* *.mm.* AutoTest.Net/ +# Web workbench (sass) +.sass-cache/ + # Installshield output folder [Ee]xpress/ From 1b94b3ccfeb36e8613ef18d6bcd53c989d081682 Mon Sep 17 00:00:00 2001 From: Diego Leme Date: Thu, 30 Jan 2014 21:15:45 -0200 Subject: [PATCH 22/51] Update nanoc.gitignore new site Nanoc --- nanoc.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nanoc.gitignore b/nanoc.gitignore index 4a2728c0..abc21828 100644 --- a/nanoc.gitignore +++ b/nanoc.gitignore @@ -1,4 +1,4 @@ -# For projects using nanoc (http://nanoc.stoneship.org/) +# For projects using nanoc (http://nanoc.ws/) # Default location for output, needs to match output_dir's value found in config.yaml output/ From 24c4e482514f6fcc3bab3ff871245ce25acb2d5c Mon Sep 17 00:00:00 2001 From: Martin Charles Date: Mon, 3 Feb 2014 11:31:02 -0500 Subject: [PATCH 23/51] Update Dart.gitignore Removed space from end of line which prevented the `pubspec.lock` from being ignored. --- Dart.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dart.gitignore b/Dart.gitignore index f336509f..2914c1be 100644 --- a/Dart.gitignore +++ b/Dart.gitignore @@ -5,7 +5,7 @@ packages/ *.js.map // Include when developing application packages -pubspec.lock +pubspec.lock // Avoid committing generated JavaScript files *.dart.js From 19fd21b6215186360448a2cca7bd697bed062f0c Mon Sep 17 00:00:00 2001 From: ahmyi Date: Wed, 5 Feb 2014 16:42:29 +0800 Subject: [PATCH 24/51] Update on using boo script generated by Unity3D --- Unity.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Unity.gitignore b/Unity.gitignore index 2ed4ccca..4d8768d6 100644 --- a/Unity.gitignore +++ b/Unity.gitignore @@ -10,3 +10,4 @@ /*.user /*.userprefs /*.pidb +/*.booproj From 38cbefd1c47c9a5099f0be953a96dd18afc928dd Mon Sep 17 00:00:00 2001 From: Christoph Emmersberger Date: Thu, 6 Feb 2014 19:00:54 +0100 Subject: [PATCH 25/51] Update JetBrains.gitignore Add plugin file description for JIRA config file containing username and password --- Global/JetBrains.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 5db4d2e7..0d6cf0de 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -21,3 +21,6 @@ out/ # generated by mpeltonen/sbt-idea plugin .idea_modules/ + +# generated by JIRA plugin +atlassian-ide-plugin.xml From 84aef6a319501f35449ad694a43d2d9c19e01494 Mon Sep 17 00:00:00 2001 From: Juergen Edelbluth Date: Thu, 6 Feb 2014 19:27:06 +0100 Subject: [PATCH 26/51] Added *.synctex.gz(busy) Sometimes it happens that you'd like to commit during a long LaTeX run. During this run, the document.synctex.gz is renamed to document.synctex.gz(busy). And you don't want to commit this file. --- TeX.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/TeX.gitignore b/TeX.gitignore index b0a911e0..f19b71f3 100644 --- a/TeX.gitignore +++ b/TeX.gitignore @@ -25,6 +25,7 @@ ## Build tool auxiliary files: *.fdb_latexmk *.synctex.gz +*.synctex.gz(busy) *.pdfsync ## Auxiliary and intermediate files from other packages: From 1389bf1b2629a62216ee910a31ec62521d8614a5 Mon Sep 17 00:00:00 2001 From: Dan Lister Date: Fri, 7 Feb 2014 11:58:43 +0000 Subject: [PATCH 27/51] Removed Visual Studio ignore rules from umbraco.gitignore --- Umbraco.gitignore | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/Umbraco.gitignore b/Umbraco.gitignore index bafe85f7..be2db99c 100644 --- a/Umbraco.gitignore +++ b/Umbraco.gitignore @@ -1,45 +1,3 @@ -# Ignore Visual Studio and system files -*.diff -*.err -*.orig -*.obj -*.pdb -*.user -*.aps -*.pch -*.vspscc -*.vssscc -*_i.c -*_p.c -*.ncb -*.suo -*.tlb -*.tlh -*.bak -*.cache -*.ilk -*.log -*.lib -*.sbr -*.scc -*.resharper -*.rej -*.swo -*.swp -*.DS_Store -*.[Pp]ublish.xml - -# Ignore Visual Studio and plugin folders -[Bb]in -[Dd]ebug -[Oo]bj/ -[Rr]elease -[Pp]review -[Tt]humbs.db -[Tt]est[Rr]esult* -[Bb]uild[Ll]og.* -_ReSharper - # Ignore Umbraco folders (Generated folders created by Umbraco) ClientDependency/ TEMP/ From 52eec8d5587035079004080d0bd5c9952d6c82bc Mon Sep 17 00:00:00 2001 From: jturmel Date: Mon, 10 Feb 2014 10:24:05 -0600 Subject: [PATCH 28/51] Add AndroidStudio gitignore file --- AndroidStudio.gitignore | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 AndroidStudio.gitignore diff --git a/AndroidStudio.gitignore b/AndroidStudio.gitignore new file mode 100644 index 00000000..2f94f599 --- /dev/null +++ b/AndroidStudio.gitignore @@ -0,0 +1,32 @@ +# Built application files +*.apk +*.ap_ + +# Files for the Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# IDE specific configuration +.idea + +# Intellij module files +*.iml + +# Crashlytics auto-generated file for Android Studio plugin +com_crashlytics_export_strings.xml From f85e67659dd4116fb7f0a8014b9ed0f00c98d2f7 Mon Sep 17 00:00:00 2001 From: Denis Grinyuk Date: Fri, 29 Nov 2013 18:55:24 +0400 Subject: [PATCH 29/51] This is not Delphi-specific folder --- Delphi.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Delphi.gitignore b/Delphi.gitignore index 02acd6a9..7c506a1a 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -11,4 +11,3 @@ __history *.dcp *.so *.apk -bin/* From 33540b975592ad3087a799b4c949c46256b3112c Mon Sep 17 00:00:00 2001 From: Denis Grinyuk Date: Fri, 29 Nov 2013 18:59:27 +0400 Subject: [PATCH 30/51] Nicer Delphi .gitignore - added header with link to official documentation about Delphi filetypes - added some missed file extensions - made some grouping with descriptions --- Delphi.gitignore | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/Delphi.gitignore b/Delphi.gitignore index 7c506a1a..61ea8577 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -1,13 +1,35 @@ -*.dcu -*.~* -*.local -*.identcache -__history -*.drc -*.map +# .gitignore template for Delphi projects +# Based on Embarcadero documentation: +# http://docwiki.embarcadero.com/RADStudio/XE5/en/File_Extensions_of_Files_Generated_by_RAD_Studio + +# Delphi compiler-generated binaries *.exe *.dll *.bpl *.dcp *.so *.apk +*.drc +*.map +*.res +*.dres +*.rsm +*.tds +*.tlb + +# Delphi autogenerated files (duplicated info) +*.cfg +*Resource.rc + +# Delphi local files (user-specific info) +*.local +*.identcache +*.projdata +*.tvsconfig +*.dsk +*.deployproj +*.vlb + +# Delphi history and backups +__history/ +*.~* From 7f275ff0ec40f7824f1e8da830d8f4065b486ded Mon Sep 17 00:00:00 2001 From: Denis Grinyuk Date: Wed, 15 Jan 2014 18:09:26 +0400 Subject: [PATCH 31/51] Some filetypes should be commented by default --- Delphi.gitignore | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Delphi.gitignore b/Delphi.gitignore index 61ea8577..17bfdf9c 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -2,6 +2,17 @@ # Based on Embarcadero documentation: # http://docwiki.embarcadero.com/RADStudio/XE5/en/File_Extensions_of_Files_Generated_by_RAD_Studio +# !!! ATTENTION !!! +# These types should be ignored in most cases. +# Leave this lines commented only if you know what you are doing. +# And please DO NOT store .res files in repository. Try to get rid of them. +# +#*.res +#*.ddp +#*.vlb +#*.deployproj +# + # Delphi compiler-generated binaries *.exe *.dll @@ -11,7 +22,6 @@ *.apk *.drc *.map -*.res *.dres *.rsm *.tds @@ -27,8 +37,6 @@ *.projdata *.tvsconfig *.dsk -*.deployproj -*.vlb # Delphi history and backups __history/ From baf7fe56e6878d9212a5b1ff19399fe934e09cb7 Mon Sep 17 00:00:00 2001 From: Denis Grinyuk Date: Thu, 16 Jan 2014 13:05:02 +0400 Subject: [PATCH 32/51] One more compiler-generated binary --- Delphi.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Delphi.gitignore b/Delphi.gitignore index 17bfdf9c..6f5755c3 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -17,6 +17,7 @@ *.exe *.dll *.bpl +*.bpi *.dcp *.so *.apk From 432f6edf3876a5e2aa8ea545fd15f99953339aba Mon Sep 17 00:00:00 2001 From: Denis Grinyuk Date: Mon, 3 Feb 2014 14:52:36 +0400 Subject: [PATCH 33/51] Additional comments --- Delphi.gitignore | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Delphi.gitignore b/Delphi.gitignore index 6f5755c3..39a8b66a 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -1,17 +1,24 @@ # .gitignore template for Delphi projects # Based on Embarcadero documentation: # http://docwiki.embarcadero.com/RADStudio/XE5/en/File_Extensions_of_Files_Generated_by_RAD_Studio +# Some older file types can be found here: +# http://delphi.wikia.com/wiki/Delphi_File_Extensions + # !!! ATTENTION !!! # These types should be ignored in most cases. # Leave this lines commented only if you know what you are doing. # And please DO NOT store .res files in repository. Try to get rid of them. # +# Resource files usually store project icon and version info. These should be included by means of .rc files. #*.res +# Delphi Diagram Portfolio file. Used by the diagram editor in Delphi 7. Uncomment this if you are not using diagrams. #*.ddp +# Visual LiveBindings file. Uncomment this if you are not using LiveBindings Designer. #*.vlb +# Deployment Manager configuration file for your project. Uncomment this if it is not mobile development and you do not use remote debug feature. #*.deployproj -# + # Delphi compiler-generated binaries *.exe From 9a0f32a452d0e7fc70680a0049e06c22f7144c47 Mon Sep 17 00:00:00 2001 From: jturmel Date: Wed, 12 Feb 2014 10:33:49 -0600 Subject: [PATCH 34/51] Remove AndroidStudio, modify Global/JetBrains * Remove AndroidStudio.gitignore in favor of adding the change needed to the Global/JetBrains.gitignore file --- AndroidStudio.gitignore | 32 -------------------------------- Global/JetBrains.gitignore | 3 +++ 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 AndroidStudio.gitignore diff --git a/AndroidStudio.gitignore b/AndroidStudio.gitignore deleted file mode 100644 index 2f94f599..00000000 --- a/AndroidStudio.gitignore +++ /dev/null @@ -1,32 +0,0 @@ -# Built application files -*.apk -*.ap_ - -# Files for the Dalvik VM -*.dex - -# Java class files -*.class - -# Generated files -bin/ -gen/ - -# Gradle files -.gradle/ -build/ - -# Local configuration file (sdk path, etc) -local.properties - -# Proguard folder generated by Eclipse -proguard/ - -# IDE specific configuration -.idea - -# Intellij module files -*.iml - -# Crashlytics auto-generated file for Android Studio plugin -com_crashlytics_export_strings.xml diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 0d6cf0de..47e551f5 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -24,3 +24,6 @@ out/ # generated by JIRA plugin atlassian-ide-plugin.xml + +# generated by Crashlytics plugin (for Android Studio and Intellij) +com_crashlytics_export_strings.xml From d51b1b71e9efe3468e1af9736f415ed383ecac13 Mon Sep 17 00:00:00 2001 From: Denis Grinyuk Date: Thu, 13 Feb 2014 11:29:21 +0400 Subject: [PATCH 35/51] Some cleanup --- Delphi.gitignore | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/Delphi.gitignore b/Delphi.gitignore index 39a8b66a..e186b94c 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -1,26 +1,28 @@ -# .gitignore template for Delphi projects -# Based on Embarcadero documentation: -# http://docwiki.embarcadero.com/RADStudio/XE5/en/File_Extensions_of_Files_Generated_by_RAD_Studio -# Some older file types can be found here: -# http://delphi.wikia.com/wiki/Delphi_File_Extensions - - -# !!! ATTENTION !!! -# These types should be ignored in most cases. -# Leave this lines commented only if you know what you are doing. -# And please DO NOT store .res files in repository. Try to get rid of them. +# Uncomment these types if you want even more clean repository. But be careful. +# It can make harm to an existing project source. Read explanations below. # -# Resource files usually store project icon and version info. These should be included by means of .rc files. +# Resource files are binaries containing manifest, project icon and version info. +# They can not be viewed as text or compared by diff-tools. Consider replacing them with .rc files. #*.res -# Delphi Diagram Portfolio file. Used by the diagram editor in Delphi 7. Uncomment this if you are not using diagrams. +# +# Type library file (binary). In old Delphi versions it should be stored. +# Since Delphi 2009 it is produced from .ridl file and can safely be ignored. +#*.tlb +# +# Diagram Portfolio file. Used by the diagram editor up to Delphi 7. +# Uncomment this if you are not using diagrams or use newer Delphi version. #*.ddp -# Visual LiveBindings file. Uncomment this if you are not using LiveBindings Designer. +# +# Visual LiveBindings file. Added in Delphi XE2. +# Uncomment this if you are not using LiveBindings Designer. #*.vlb -# Deployment Manager configuration file for your project. Uncomment this if it is not mobile development and you do not use remote debug feature. +# +# Deployment Manager configuration file for your project. Added in Delphi XE2. +# Uncomment this if it is not mobile development and you do not use remote debug feature. #*.deployproj +# - -# Delphi compiler-generated binaries +# Delphi compiler-generated binaries (safe to delete) *.exe *.dll *.bpl @@ -33,7 +35,6 @@ *.dres *.rsm *.tds -*.tlb # Delphi autogenerated files (duplicated info) *.cfg From 12aa1b03fc445c99698b4d4d7aed0d2d35a3849b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ionic=C4=83=20Biz=C4=83u?= Date: Thu, 13 Feb 2014 15:57:44 +0200 Subject: [PATCH 36/51] Updated the year :-) --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index f247e598..ac31f1a8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2013 GitHub, Inc. +Copyright (c) 2014 GitHub, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), From 8209ea1b3681b92e2d5947cf0e7381c64fd95ef1 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Fri, 14 Feb 2014 01:34:02 -0800 Subject: [PATCH 37/51] ignore SQL server database files --- VisualStudio.gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 60c6c27c..9103a3f2 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -158,8 +158,8 @@ UpgradeLog*.XML UpgradeLog*.htm # SQL Server files -App_Data/*.mdf -App_Data/*.ldf +*.mdf +*.ldf # Business Intelligence projects *.rdl.data From 7d60eeeece543d37c29f35bd7dc71d870aca2568 Mon Sep 17 00:00:00 2001 From: Hyeon Kim Date: Tue, 18 Feb 2014 17:25:41 +0900 Subject: [PATCH 38/51] Ignore the build result of ATL Project. This commit Makes VisualStudio.gitignore ignore the three items below. It needs when you create an ATL Project. * [Dd]ebugPS/ * [Rr]eleasePS/ * dlldata.c --- VisualStudio.gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index ac4a158c..dc61496f 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -27,6 +27,11 @@ bld/ *.VisualState.xml TestResult.xml +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + *_i.c *_p.c *_i.h From 073fd88f68f5e2d9f876dbad4c5d52dd0e9be246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Marek?= Date: Wed, 19 Feb 2014 00:30:31 +0100 Subject: [PATCH 39/51] Removed JetBrains *.iws files This entry should be (and is) rather in Global/JetBrains.gitignore --- Grails.gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/Grails.gitignore b/Grails.gitignore index 083b60f3..5bd01376 100644 --- a/Grails.gitignore +++ b/Grails.gitignore @@ -38,6 +38,3 @@ # "temporary" build files /target - -# other -*.iws From 7f7df06518921d17a5b61986c5d9947b86ff7014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Marek?= Date: Wed, 19 Feb 2014 01:16:52 +0100 Subject: [PATCH 40/51] Removed IDE support files entirely Those files should be in Global/ templates --- Grails.gitignore | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Grails.gitignore b/Grails.gitignore index 5bd01376..22bf40d1 100644 --- a/Grails.gitignore +++ b/Grails.gitignore @@ -3,16 +3,6 @@ # web application files /web-app/WEB-INF/classes -# IDE support files -/.classpath -/.launch -/.project -/.settings -/*.launch -/*.tmproj -/ivy* -/eclipse - # default HSQL database files for production mode /prodDb.* From 503bde5d249374a35ea9296ba707af66b03451db Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Wed, 12 Feb 2014 22:09:34 +1100 Subject: [PATCH 41/51] Merge Sass and Compass templates --- Global/SASS.gitignore | 2 -- Compass.gitignore => Sass.gitignore | 0 2 files changed, 2 deletions(-) delete mode 100644 Global/SASS.gitignore rename Compass.gitignore => Sass.gitignore (100%) diff --git a/Global/SASS.gitignore b/Global/SASS.gitignore deleted file mode 100644 index c1df001e..00000000 --- a/Global/SASS.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -### Sass Ignores - "Sassy CSS" http://sass-lang.com/ -*.sass-cache diff --git a/Compass.gitignore b/Sass.gitignore similarity index 100% rename from Compass.gitignore rename to Sass.gitignore From 553033ff2f89c1fcb4cad90dfef15c614ca7324f Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Wed, 12 Feb 2014 22:09:54 +1100 Subject: [PATCH 42/51] Remove old sass-cache rule for Rails --- Rails.gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/Rails.gitignore b/Rails.gitignore index 56454403..1a2c94dc 100644 --- a/Rails.gitignore +++ b/Rails.gitignore @@ -1,6 +1,4 @@ *.rbc -*.sassc -.sass-cache capybara-*.html .rspec /log From b83dd2fb1eb01437bc8d61b1a5d062e2c376a59f Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Sun, 23 Feb 2014 19:22:13 -0500 Subject: [PATCH 43/51] Ignore signed pom files in leiningen projects Pom files are commonly signed before deploy as part of the build/signoff process --- Leiningen.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Leiningen.gitignore b/Leiningen.gitignore index b8d32453..4076612d 100644 --- a/Leiningen.gitignore +++ b/Leiningen.gitignore @@ -1,4 +1,5 @@ pom.xml +pom.xml.asc *jar /lib/ /classes/ From e5128246c5d67289c4e6932fb85d062ae74d6dd4 Mon Sep 17 00:00:00 2001 From: Louis M Date: Mon, 24 Feb 2014 10:19:00 -0500 Subject: [PATCH 44/51] Adding the EiffelStudio .gitingore file. --- EiffelStudio.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 EiffelStudio.gitignore diff --git a/EiffelStudio.gitignore b/EiffelStudio.gitignore new file mode 100644 index 00000000..a7ba35f8 --- /dev/null +++ b/EiffelStudio.gitignore @@ -0,0 +1,2 @@ +# The compilation directoy +EIFGENs From d61f35aa62b19c162901021dbd49d6f924aa4926 Mon Sep 17 00:00:00 2001 From: Mike Manger Date: Tue, 25 Feb 2014 11:47:19 +0000 Subject: [PATCH 45/51] Ignore log of applied patches Magento keeps a log of official patches applied in this file. --- Magento.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Magento.gitignore b/Magento.gitignore index db650756..3309871b 100644 --- a/Magento.gitignore +++ b/Magento.gitignore @@ -35,6 +35,7 @@ app/etc/modules/Mage_Widget.xml app/etc/modules/Mage_XmlConnect.xml app/etc/modules/Phoenix_Moneybookers.xml app/etc/modules/Cm_RedisSession.xml +app/etc/applied.patches.list app/etc/config.xml app/etc/enterprise.xml app/etc/local.xml.additional From 5efebe2ef3ad0709f299d95ce2f0cc766253921e Mon Sep 17 00:00:00 2001 From: James Chambers Date: Thu, 27 Feb 2014 14:12:05 -0500 Subject: [PATCH 46/51] Enable Ignore of NuGet Packages Folder By Default Submitting this for consideration. The first thing that I do on every new project is to go in and uncomment the packages folder. With the prevalence of NuGet and prominence of its use in the Visual Studio environment, along with how well package restore *just works* now, I believe this should be the default. While I understand that package restore isn't on by default, I would argue that the types of developers using NuGet _and_ a distributed SCM are the types of developers that would omit the binaries from source control. --- VisualStudio.gitignore => IgnorePackages | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename VisualStudio.gitignore => IgnorePackages (93%) diff --git a/VisualStudio.gitignore b/IgnorePackages similarity index 93% rename from VisualStudio.gitignore rename to IgnorePackages index 2518b002..d5ab3bec 100644 --- a/VisualStudio.gitignore +++ b/IgnorePackages @@ -123,9 +123,8 @@ publish/ *.azurePubxml # NuGet Packages Directory -## TODO: If you have NuGet Package Restore enabled, uncomment the next line -#packages/* -## TODO: If the tool you use requires repositories.config, also uncomment the next line +packages/* +## TODO: If the tool you use requires repositories.config uncomment the next line #!packages/repositories.config # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets From 3bb4e51184066f5cf60daa029c31e7f52398353b Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Mon, 24 Feb 2014 03:07:48 -0500 Subject: [PATCH 47/51] Fix typo in haskell gitignore --- Haskell.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Haskell.gitignore b/Haskell.gitignore index cc143076..01e585ae 100644 --- a/Haskell.gitignore +++ b/Haskell.gitignore @@ -4,7 +4,7 @@ cabal-dev *.hi *.chi *.chs.h -.virthualenv +.virtualenv .hsenv .cabal-sandbox/ cabal.sandbox.config From 8ff2f7af0f1f7cbdc39728decb3148811b5e4d48 Mon Sep 17 00:00:00 2001 From: "Zhishen (Jason) Wen" Date: Thu, 27 Feb 2014 21:27:21 -0500 Subject: [PATCH 48/51] Update Leiningen.gitignore --- Leiningen.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Leiningen.gitignore b/Leiningen.gitignore index b8d32453..59b0e5ce 100644 --- a/Leiningen.gitignore +++ b/Leiningen.gitignore @@ -3,6 +3,8 @@ pom.xml /lib/ /classes/ /target/ +/checkouts/ .lein-deps-sum .lein-repl-history .lein-plugins/ +.lein-failures From 009b474870b4f5735d68807549ba3ba5a7adb1fa Mon Sep 17 00:00:00 2001 From: Louis M Date: Thu, 27 Feb 2014 21:41:28 -0500 Subject: [PATCH 49/51] Move the EiffelStudio.gitignore in the Global directory --- EiffelStudio.gitignore => Global/EiffelStudio.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename EiffelStudio.gitignore => Global/EiffelStudio.gitignore (100%) diff --git a/EiffelStudio.gitignore b/Global/EiffelStudio.gitignore similarity index 100% rename from EiffelStudio.gitignore rename to Global/EiffelStudio.gitignore From fef9e2d85d14b379f5d144451cf1d447cfdd46de Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Mon, 24 Feb 2014 03:07:24 -0500 Subject: [PATCH 50/51] Add an Idris gitignore --- Idris.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Idris.gitignore diff --git a/Idris.gitignore b/Idris.gitignore new file mode 100644 index 00000000..c28bc7cc --- /dev/null +++ b/Idris.gitignore @@ -0,0 +1,2 @@ +*.ibc +*.o From 13c119f167ad522109bc8c378a5abc4ebfccb5d4 Mon Sep 17 00:00:00 2001 From: Dennis Xiloj Date: Fri, 28 Feb 2014 00:26:43 -0600 Subject: [PATCH 51/51] Added ignore for directory config under KDE Dolphin, the KDE file manager, writes specific directory configuration in .directory files. --- Global/Linux.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Global/Linux.gitignore b/Global/Linux.gitignore index b25c15b8..9911632b 100644 --- a/Global/Linux.gitignore +++ b/Global/Linux.gitignore @@ -1 +1,4 @@ *~ + +# KDE directory preferences +.directory