From 34f93ffcbc5a6ff6918fb48d5c4d448658b50c4b Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 3 Dec 2013 14:47:58 +0100 Subject: [PATCH 01/41] Created Zend Framework 2 gitignore file --- ZendFramework2.gitignore | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 ZendFramework2.gitignore diff --git a/ZendFramework2.gitignore b/ZendFramework2.gitignore new file mode 100644 index 00000000..645d9318 --- /dev/null +++ b/ZendFramework2.gitignore @@ -0,0 +1,22 @@ +# License and readme +INSTALL* +LICENSE* +README* + +# Composer files +composer.lock +composer.phar +vendor/ + +# Local configs +config/autoload/*local.php + +# Binary gettext files +*.po + +# Data +log/ +logs/ +cache/ +temp/ +tmp/ \ No newline at end of file From c2351631b7671f375542ce4f43bb9142b17d6d8b Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 3 Dec 2013 14:51:50 +0100 Subject: [PATCH 02/41] Included missing new line --- ZendFramework2.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZendFramework2.gitignore b/ZendFramework2.gitignore index 645d9318..526a85cc 100644 --- a/ZendFramework2.gitignore +++ b/ZendFramework2.gitignore @@ -19,4 +19,4 @@ log/ logs/ cache/ temp/ -tmp/ \ No newline at end of file +tmp/ From 52ff767b7a16caf3e7b61213669e3c4f258875ea Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Fri, 21 Feb 2014 10:34:02 +1100 Subject: [PATCH 03/41] Stop ignoring bin/ in Python template --- Python.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Python.gitignore b/Python.gitignore index 76f2a469..d1f1738d 100644 --- a/Python.gitignore +++ b/Python.gitignore @@ -8,7 +8,6 @@ __pycache__/ # Distribution / packaging .Python env/ -bin/ build/ develop-eggs/ dist/ From 26c17fe2db828dbf8ff74e8e6e66fcefd232f182 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Fri, 21 Feb 2014 10:34:46 +1100 Subject: [PATCH 04/41] Remove Mr Developer and Rope rules from Python template --- Python.gitignore | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Python.gitignore b/Python.gitignore index d1f1738d..45437090 100644 --- a/Python.gitignore +++ b/Python.gitignore @@ -35,18 +35,9 @@ coverage.xml # Translations *.mo -# Mr Developer -.mr.developer.cfg -.project -.pydevproject - -# Rope -.ropeproject - # Django stuff: *.log *.pot # Sphinx documentation docs/_build/ - From 2aadf75fd68109df101dce209a4434c0fea3f356 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Fri, 21 Feb 2014 10:52:28 +1100 Subject: [PATCH 05/41] Group gettext files in the Python template --- Python.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Python.gitignore b/Python.gitignore index 45437090..1fade719 100644 --- a/Python.gitignore +++ b/Python.gitignore @@ -34,10 +34,10 @@ coverage.xml # Translations *.mo +*.pot # Django stuff: *.log -*.pot # Sphinx documentation docs/_build/ From 4d30a45c9e96a07fc2af0d299dbfcd64d38a1ee9 Mon Sep 17 00:00:00 2001 From: cheddar Date: Fri, 4 Apr 2014 10:05:58 -0500 Subject: [PATCH 06/41] Remove opinion from Node.js .gitignore file This is a PR to remove the opinionated lines from the Node.js .gitignore file. I do not believe that Github's pre-baked .gitignore files should be promulgating opinions, especially in a community that is as fresh as the Node.js community. Questions of what should be checked in should be a decision made on an organization-by-organization basis, or left up to the individual. Github's inclusion of opinion in these files puts unnecessary authority behind that opinion, which can have the negative side-effect of people following without thinking. --- Node.gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/Node.gitignore b/Node.gitignore index da23d0d4..336f730c 100644 --- a/Node.gitignore +++ b/Node.gitignore @@ -20,6 +20,4 @@ coverage build/Release # Dependency directory -# Deployed apps should consider commenting this line out: -# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git node_modules From 9390b1072d66cd7ae77d286d58d5b2acb411d57d Mon Sep 17 00:00:00 2001 From: cheddar Date: Fri, 4 Apr 2014 17:33:30 -0500 Subject: [PATCH 07/41] Reintroduce link to npmjs And remove my own opinions... --- Node.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Node.gitignore b/Node.gitignore index 336f730c..e33a7f7d 100644 --- a/Node.gitignore +++ b/Node.gitignore @@ -20,4 +20,6 @@ coverage 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 node_modules From 206c7e4577d608363f83f75e0e8499f70049cdf8 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Sun, 13 Apr 2014 13:53:34 -0700 Subject: [PATCH 08/41] improve umbraco ignores --- Umbraco.gitignore | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Umbraco.gitignore b/Umbraco.gitignore index be2db99c..563483f5 100644 --- a/Umbraco.gitignore +++ b/Umbraco.gitignore @@ -1,9 +1,17 @@ -# Ignore Umbraco folders (Generated folders created by Umbraco) -ClientDependency/ -TEMP/ -Logs/ +# Make sure to include ignores from VisualStudio.gitignore if developing on Umbraco using Visual Studio + +# Ignore unimportant folders generated by Umbraco +**/App_Data/ClientDependency/ +**/App_Data/ExamineIndexes/ +**/App_Data/Logs/ +**/App_Data/[Pp]review/ +**/App_Data/TEMP/ Cached/ -ExamineIndexes/ # Ignore Umbraco content cache file -umbraco.config +**/App_Data/umbraco.config + +# Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder) +# Make sure to include details from VisualStudio.gitignore BEFORE this +!**/App_Data/[Pp]ackages/ +!**/[Uu]mbraco/developer/[Pp]ackages \ No newline at end of file From dba7d3de2bbfd3a28ed0191d693d0efb298d3da3 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 14 Apr 2014 06:02:29 -0700 Subject: [PATCH 09/41] Adds Roslyn .ide directories to .gitignore. --- VisualStudio.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 745d9301..1efad386 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -16,6 +16,9 @@ bld/ [Bb]in/ [Oo]bj/ +# Roslyn cache directories +*.ide + # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* From bc6f3751b2b49c2c4cf1dac7b3669bb9bd983e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20B=C3=B6cker?= Date: Tue, 15 Apr 2014 16:19:56 +0200 Subject: [PATCH 10/41] Fixed typo in comment --- Global/OSX.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore index 60a75e6e..5e410368 100644 --- a/Global/OSX.gitignore +++ b/Global/OSX.gitignore @@ -2,7 +2,7 @@ .AppleDouble .LSOverride -# Icon must ends with two \r. +# Icon must end with two \r Icon # Thumbnails From af7c660e34e52b999e0bea3b0d8d02cf07fe9c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvis=20Nu=C3=B1ez?= Date: Tue, 15 Apr 2014 18:56:25 +0200 Subject: [PATCH 11/41] Ignore xcuserstate xcuserstate files are generated from within Xcode and saved in your project bundle to remember your last opened file, the open state of any group folders, open tabs, and any other user setting your project might need to remember --- Objective-C.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 8f9935da..1e390d04 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -15,6 +15,7 @@ xcuserdata DerivedData *.hmap *.ipa +*.xcuserstate # CocoaPods # From 37372e0f64aa83a618eefb7b96bac0001a35effe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvis=20Nu=C3=B1ez?= Date: Tue, 15 Apr 2014 18:59:29 +0200 Subject: [PATCH 12/41] Ignore xcuserstate xcuserstate files are generated from within Xcode and saved in your project bundle to remember your last opened file, the open state of any group folders, open tabs, and any other user setting your project might need to remember, this is something that shouldn't be tracked in version control --- Global/Xcode.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore index 3a130f18..1b81d249 100644 --- a/Global/Xcode.gitignore +++ b/Global/Xcode.gitignore @@ -11,3 +11,4 @@ xcuserdata *.xccheckout *.moved-aside DerivedData +*.xcuserstate From 7562a0b19d1ff6fcfd7c8f8446c8fc344ded8026 Mon Sep 17 00:00:00 2001 From: Alireza Zabandan Date: Wed, 16 Apr 2014 04:35:10 +0430 Subject: [PATCH 13/41] Laravel4 gitignore --- Laravel4.gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Laravel4.gitignore diff --git a/Laravel4.gitignore b/Laravel4.gitignore new file mode 100644 index 00000000..ac3492e2 --- /dev/null +++ b/Laravel4.gitignore @@ -0,0 +1,3 @@ +/bootstrap/compiled.php +.env.*.php +.env.php From a64bf75ee35fdf8ce0281e3598c1d0dae1138be2 Mon Sep 17 00:00:00 2001 From: "Michael S. Christensen" Date: Wed, 16 Apr 2014 08:51:19 +0200 Subject: [PATCH 14/41] Added .rel-files Reftex adds these for internal processing, only auxillary files for composition and compilation of tex-documents. --- Global/Emacs.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Global/Emacs.gitignore b/Global/Emacs.gitignore index 9e44d0a8..a1bceafc 100644 --- a/Global/Emacs.gitignore +++ b/Global/Emacs.gitignore @@ -21,3 +21,6 @@ tramp # elpa packages /elpa/ + +# reftex files +*.rel From 727ed0d9523a99167d1757fcb32278641ff289fa Mon Sep 17 00:00:00 2001 From: Kevin Pilch-Bisson Date: Wed, 16 Apr 2014 19:43:13 -0700 Subject: [PATCH 15/41] Add trailing / for Roslyn cache directories --- VisualStudio.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 1efad386..6dffb673 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -17,7 +17,7 @@ bld/ [Oo]bj/ # Roslyn cache directories -*.ide +*.ide/ # MSTest test Results [Tt]est[Rr]esult*/ From 44d815e407a1d0f5c83ab5e51c927eeef87acfda Mon Sep 17 00:00:00 2001 From: DaikiMaekawa Date: Thu, 17 Apr 2014 21:08:18 +0900 Subject: [PATCH 16/41] Fixed typo --- ROS.gitignore | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ROS.gitignore b/ROS.gitignore index 7b171072..9d6a2002 100644 --- a/ROS.gitignore +++ b/ROS.gitignore @@ -1,30 +1,30 @@ -~$ -.swp$ +~ +.swp build/ bin/ lib/ msg_gen/ srv_gen/ -msg/.*Action\.msg$ -msg/.*ActionFeedback\.msg$ -msg/.*ActionGoal\.msg$ -msg/.*ActionResult\.msg$ -msg/.*Feedback\.msg$ -msg/.*Goal\.msg$ -msg/.*Result\.msg$ -msg/_.*\.py$ +msg/.*Action\.msg +msg/.*ActionFeedback\.msg +msg/.*ActionGoal\.msg +msg/.*ActionResult\.msg +msg/.*Feedback\.msg +msg/.*Goal\.msg +msg/.*Result\.msg +msg/_.*\.py -\.pcd$ -.pyc$ +\.pcd +.pyc # Generated by dynamic reconfigure -\.cfgc$ +\.cfgc /cfg/cpp/ -/cfg/.*\.py$ +/cfg/.*\.py # Ignore generated docs -.dox$ -.wikidoc$ +.dox +.wikidoc # eclipse stuff .project @@ -33,9 +33,9 @@ msg/_.*\.py$ # qcreator stuff CMakeLists.txt.user -srv/_.*\.py$ -\.pcd$ -.pyc$ +srv/_.*\.py +\.pcd +.pyc qtcreator-* *.user @@ -43,7 +43,7 @@ qtcreator-* /planning/docs /planning/src -*~$ +*~ # Emacs .#* From d4c7dbcaf94abd0963f789535254af1dbcd540fd Mon Sep 17 00:00:00 2001 From: "Michael S. Christensen" Date: Thu, 17 Apr 2014 18:21:11 +0200 Subject: [PATCH 17/41] Ignor auctex auto-folder and contents When working with multifile LaTeX-documents in AUCTeX in emacs, it creates the auto-folder to keep track of styles, macros etc. in the whole document. Unnecessary of versioning purposes. --- Global/Emacs.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Global/Emacs.gitignore b/Global/Emacs.gitignore index a1bceafc..1b571c30 100644 --- a/Global/Emacs.gitignore +++ b/Global/Emacs.gitignore @@ -24,3 +24,6 @@ tramp # reftex files *.rel + +# AUCTeX auto folder +/auto/ From 5f1911f3b49d1c62cb48a7d6c199e455488066da Mon Sep 17 00:00:00 2001 From: Adam Gross Date: Fri, 18 Apr 2014 13:19:46 -0400 Subject: [PATCH 18/41] Simple grammar update --- Rails.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rails.gitignore b/Rails.gitignore index c5c092be..e74e3bc6 100644 --- a/Rails.gitignore +++ b/Rails.gitignore @@ -11,7 +11,7 @@ capybara-*.html rerun.txt pickle-email-*.html -# TODO Comment out this rules if you are OK with secrets been uploaded to the repo +# TODO Comment out these rules if you are OK with secrets been uploaded to the repo config/initializers/secret_token.rb config/secrets.yml From b7664de6996c033d3fc22104c3edf11e36b0fa89 Mon Sep 17 00:00:00 2001 From: Adam Gross Date: Fri, 18 Apr 2014 13:32:38 -0400 Subject: [PATCH 19/41] Changing been to being per https://github.com/tmountjr --- Rails.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rails.gitignore b/Rails.gitignore index e74e3bc6..d9474d9d 100644 --- a/Rails.gitignore +++ b/Rails.gitignore @@ -11,7 +11,7 @@ capybara-*.html rerun.txt pickle-email-*.html -# TODO Comment out these rules if you are OK with secrets been uploaded to the repo +# TODO Comment out these rules if you are OK with secrets being uploaded to the repo config/initializers/secret_token.rb config/secrets.yml From bf166d4be4955aa63fe4b7b1d619e6496aa7a7d5 Mon Sep 17 00:00:00 2001 From: szp Date: Sat, 19 Apr 2014 20:40:57 +0800 Subject: [PATCH 20/41] =?UTF-8?q?add=20ignore=20log=20files=EF=BC=88Androi?= =?UTF-8?q?d=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Android.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Android.gitignore b/Android.gitignore index 64d3c976..6b6f0a93 100644 --- a/Android.gitignore +++ b/Android.gitignore @@ -21,3 +21,6 @@ local.properties # Proguard folder generated by Eclipse proguard/ + +#Log Files +*.log \ No newline at end of file From a7af8cf3d1d8bc681ac950fa2a797b228617478f Mon Sep 17 00:00:00 2001 From: Bohdan Shulha Date: Wed, 23 Apr 2014 10:59:33 +0300 Subject: [PATCH 21/41] Splitted large comments into a few lines --- VisualStudio.gitignore | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 6dffb673..ac0bd020 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -123,16 +123,21 @@ publish/ # Publish Web Output *.[Pp]ublish.xml *.azurePubxml -## TODO: Comment the next line if you want to checkin your web deploy settings but do note that will include unencrypted passwords +## TODO: Comment the next line if you want to checkin your +## web deploy settings but do note that will include unencrypted +## passwords *.pubxml # NuGet Packages Directory packages/* -## TODO: If the tool you use requires repositories.config uncomment the next line +## 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 -# This line needs to be after the ignore of the build folder (and the packages folder if the line above has been uncommented) +# 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 @@ -158,8 +163,9 @@ node_modules/ # RIA/Silverlight projects Generated_Code/ -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML From 4ded81fb2eff9336de6912adfa391b4892f5f192 Mon Sep 17 00:00:00 2001 From: DaikiMaekawa Date: Wed, 23 Apr 2014 20:46:03 +0900 Subject: [PATCH 22/41] Remove unnecessary rules --- ROS.gitignore | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/ROS.gitignore b/ROS.gitignore index 9d6a2002..f8bcd117 100644 --- a/ROS.gitignore +++ b/ROS.gitignore @@ -1,30 +1,25 @@ -~ -.swp build/ bin/ lib/ msg_gen/ srv_gen/ -msg/.*Action\.msg -msg/.*ActionFeedback\.msg -msg/.*ActionGoal\.msg -msg/.*ActionResult\.msg -msg/.*Feedback\.msg -msg/.*Goal\.msg -msg/.*Result\.msg -msg/_.*\.py - -\.pcd -.pyc +msg/*Action.msg +msg/*ActionFeedback.msg +msg/*ActionGoal.msg +msg/*ActionResult.msg +msg/*Feedback.msg +msg/*Goal.msg +msg/*Result.msg +msg/_*.py # Generated by dynamic reconfigure -\.cfgc +*.cfgc /cfg/cpp/ -/cfg/.*\.py +/cfg/*.py # Ignore generated docs -.dox -.wikidoc +*.dox +*.wikidoc # eclipse stuff .project @@ -33,9 +28,9 @@ msg/_.*\.py # qcreator stuff CMakeLists.txt.user -srv/_.*\.py -\.pcd -.pyc +srv/_*.py +*.pcd +*.pyc qtcreator-* *.user From 5eacf05adb5a1c6efe7205b766953c537bbab064 Mon Sep 17 00:00:00 2001 From: Jacob Rigby Date: Wed, 23 Apr 2014 15:50:28 -0500 Subject: [PATCH 23/41] Fix eol issues Some files don't contain a line separator ('\n') at the end. Add the missing eol. In POSIX, all lines of text should end with a newline character by definition. See http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html section 3.397 for more. See https://gist.github.com/jacknagel/1020172 for a gist of the issue. --- Android.gitignore | 2 +- CodeIgniter.gitignore | 2 +- Composer.gitignore | 2 +- Symfony2.gitignore | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Android.gitignore b/Android.gitignore index 6b6f0a93..3a36c6e7 100644 --- a/Android.gitignore +++ b/Android.gitignore @@ -23,4 +23,4 @@ local.properties proguard/ #Log Files -*.log \ No newline at end of file +*.log diff --git a/CodeIgniter.gitignore b/CodeIgniter.gitignore index ca0e37ee..846b8c54 100644 --- a/CodeIgniter.gitignore +++ b/CodeIgniter.gitignore @@ -3,4 +3,4 @@ */logs/!index.html */cache/* */cache/!index.html -*/cache/!.htaccess \ No newline at end of file +*/cache/!.htaccess diff --git a/Composer.gitignore b/Composer.gitignore index aa5997f4..3a693c92 100644 --- a/Composer.gitignore +++ b/Composer.gitignore @@ -3,4 +3,4 @@ vendor/ # Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock \ No newline at end of file +# composer.lock diff --git a/Symfony2.gitignore b/Symfony2.gitignore index f4a95cb4..f5465e10 100644 --- a/Symfony2.gitignore +++ b/Symfony2.gitignore @@ -13,4 +13,4 @@ app/config/parameters.ini app/config/parameters.yml # Composer -composer.phar \ No newline at end of file +composer.phar From 4ccd14486cad775540a295723dbd2f0f95265333 Mon Sep 17 00:00:00 2001 From: Kyle Fuller Date: Thu, 24 Apr 2014 15:01:04 +0100 Subject: [PATCH 24/41] [Objective-C] Fixes a broken link This got changed recently. --- Objective-C.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 1e390d04..a3cd143a 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -21,6 +21,6 @@ DerivedData # # We recommend against adding the Pods directory to your .gitignore. However # you should judge for yourself, the pros and cons are mentioned at: -# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control? +# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control # # Pods/ From b8a520853b7c5f9f1d5290085efd4f9d1e04fdb8 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Fri, 25 Apr 2014 08:13:24 +0200 Subject: [PATCH 25/41] Composer.lock and READMEs are no longer ignored --- ZendFramework2.gitignore | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ZendFramework2.gitignore b/ZendFramework2.gitignore index 526a85cc..6c7b29c7 100644 --- a/ZendFramework2.gitignore +++ b/ZendFramework2.gitignore @@ -1,10 +1,4 @@ -# License and readme -INSTALL* -LICENSE* -README* - # Composer files -composer.lock composer.phar vendor/ From 235d4add77c98e359ba7c139b954b7aab61f1a00 Mon Sep 17 00:00:00 2001 From: Sebastian Godelet Date: Sun, 27 Apr 2014 13:06:27 +0200 Subject: [PATCH 26/41] add Mercury language gitignore template --- Mercury.gitignore | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Mercury.gitignore diff --git a/Mercury.gitignore b/Mercury.gitignore new file mode 100644 index 00000000..69f5a249 --- /dev/null +++ b/Mercury.gitignore @@ -0,0 +1,13 @@ +Mercury/ +.*.swp +tags +*.mh +*.err +*.init +*.dll +*.exe +*.a +*.so +*.dylib +*.d +*.c_date From 0729f61dc0b8a79ef3db26ea9d87607ba0e27432 Mon Sep 17 00:00:00 2001 From: Sebastian Godelet Date: Tue, 29 Apr 2014 12:15:00 +0200 Subject: [PATCH 27/41] removed Vim and ctags specific ignores; as these are handled in Global/ --- Mercury.gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/Mercury.gitignore b/Mercury.gitignore index 69f5a249..d1d7119c 100644 --- a/Mercury.gitignore +++ b/Mercury.gitignore @@ -1,6 +1,4 @@ Mercury/ -.*.swp -tags *.mh *.err *.init From 50e59ac3c82789bd535b4ce728240573a2889ec4 Mon Sep 17 00:00:00 2001 From: Theo Pack Date: Sun, 4 May 2014 18:27:23 +0200 Subject: [PATCH 28/41] Add .gitignore for Elixir --- Elixir.gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Elixir.gitignore diff --git a/Elixir.gitignore b/Elixir.gitignore new file mode 100644 index 00000000..96076718 --- /dev/null +++ b/Elixir.gitignore @@ -0,0 +1,4 @@ +/_build +/deps +erl_crash.dump +*.ez From 5b168d43009dbfa9e5b02dd6be7ee5961059ea61 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Tue, 6 May 2014 17:38:57 +1000 Subject: [PATCH 29/41] Remove redundant Umbraco exceptions to VS rules From the discussion on #1013: Since the rule in VS is packages/*, the fact that it contains a slash means that it is anchored to the top level. That is, is will only apply to a directory called packages at the top level, and not to any at deeper directories like App_Data. So these rules at the bottom of your changes actually aren't necessary after all. I just confirmed this with a quick test. --- Umbraco.gitignore | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Umbraco.gitignore b/Umbraco.gitignore index 563483f5..c4f7578f 100644 --- a/Umbraco.gitignore +++ b/Umbraco.gitignore @@ -10,8 +10,3 @@ Cached/ # Ignore Umbraco content cache file **/App_Data/umbraco.config - -# Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder) -# Make sure to include details from VisualStudio.gitignore BEFORE this -!**/App_Data/[Pp]ackages/ -!**/[Uu]mbraco/developer/[Pp]ackages \ No newline at end of file From 7955283b13f7b8fe23bb91b9ea6e2f4cc14ba6f3 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Tue, 6 May 2014 17:42:22 +1000 Subject: [PATCH 30/41] Shorten note in comment at the top --- Umbraco.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Umbraco.gitignore b/Umbraco.gitignore index c4f7578f..f762672e 100644 --- a/Umbraco.gitignore +++ b/Umbraco.gitignore @@ -1,4 +1,4 @@ -# Make sure to include ignores from VisualStudio.gitignore if developing on Umbraco using Visual Studio +# Note: VisualStudio gitignore rules may also be relevant # Ignore unimportant folders generated by Umbraco **/App_Data/ClientDependency/ From 00d75ccb52ba50a6dc96234c6065613a978f8468 Mon Sep 17 00:00:00 2001 From: Mateusz Wolsza Date: Tue, 6 May 2014 12:10:00 +0200 Subject: [PATCH 31/41] Releases should also be ignored "Releases" directory is created by Shimmer/Squirrel installer for example. It also should be ignored. --- VisualStudio.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index ac0bd020..4360f275 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -9,7 +9,7 @@ # Build results [Dd]ebug/ [Dd]ebugPublic/ -[Rr]elease/ +[Rr]elease[s]/ x64/ build/ bld/ From ae4baaa4f99b9e4cd588424d989d9bc10672b2fa Mon Sep 17 00:00:00 2001 From: RX14 Date: Tue, 6 May 2014 17:06:01 +0100 Subject: [PATCH 32/41] Update Gradle.gitignore Update Gradle.gitignore --- Gradle.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gradle.gitignore b/Gradle.gitignore index 7f6823bc..ca611cf8 100644 --- a/Gradle.gitignore +++ b/Gradle.gitignore @@ -1,2 +1,5 @@ .gradle build/ + +# Ignore Gradle GUI config +gradle-app.setting From deebadef075cf1e3f2a08b5d06df1db1e0828cd9 Mon Sep 17 00:00:00 2001 From: rasbt Date: Tue, 6 May 2014 14:47:52 -0400 Subject: [PATCH 33/41] added gitignore for IPython notebooks --- Global/IPython.gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Global/IPython.gitignore diff --git a/Global/IPython.gitignore b/Global/IPython.gitignore new file mode 100644 index 00000000..155985e2 --- /dev/null +++ b/Global/IPython.gitignore @@ -0,0 +1,4 @@ +# Temporary data +.ipynb_checkpoints/ + + From bd0a82e1d5c94191e06284317596231c32761c2c Mon Sep 17 00:00:00 2001 From: rasbt Date: Tue, 6 May 2014 14:48:13 -0400 Subject: [PATCH 34/41] added gitignore for IPython notebooks --- Global/{IPython.gitignore => IPythonNotebook.gitignore} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Global/{IPython.gitignore => IPythonNotebook.gitignore} (100%) diff --git a/Global/IPython.gitignore b/Global/IPythonNotebook.gitignore similarity index 100% rename from Global/IPython.gitignore rename to Global/IPythonNotebook.gitignore From 11e30dad3d1a343a49904f8fdbc53631cec98d12 Mon Sep 17 00:00:00 2001 From: Mateusz Wolsza Date: Wed, 7 May 2014 13:14:53 +0200 Subject: [PATCH 35/41] Releases should be ignored --- VisualStudio.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 4360f275..7414ecfb 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -9,7 +9,8 @@ # Build results [Dd]ebug/ [Dd]ebugPublic/ -[Rr]elease[s]/ +[Rr]elease/ +[Rr]eleases/ x64/ build/ bld/ From 48e703a2c233dba6ebdcfffab117ec410a5ba84b Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Wed, 7 May 2014 21:22:24 +1000 Subject: [PATCH 36/41] Remove stray whitespace Amending #1072 --- Global/IPythonNotebook.gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/Global/IPythonNotebook.gitignore b/Global/IPythonNotebook.gitignore index 155985e2..27c13510 100644 --- a/Global/IPythonNotebook.gitignore +++ b/Global/IPythonNotebook.gitignore @@ -1,4 +1,2 @@ # Temporary data .ipynb_checkpoints/ - - From 446dae3d53caf99c418f1298ea90a56f92b86547 Mon Sep 17 00:00:00 2001 From: "Scott J. Roberts" Date: Wed, 7 May 2014 17:47:05 -0400 Subject: [PATCH 37/41] Adding .lock-wscript --- Node.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Node.gitignore b/Node.gitignore index e33a7f7d..a4af05a6 100644 --- a/Node.gitignore +++ b/Node.gitignore @@ -23,3 +23,6 @@ build/Release # Commenting this out is preferred by some people, see # https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git node_modules + +# Users Environment Variables +.lock-wscript From 88e26bf5aa71e69908d9c919972e876cda971968 Mon Sep 17 00:00:00 2001 From: Konstantinos Bariotis Date: Thu, 8 May 2014 16:46:54 +0300 Subject: [PATCH 38/41] "TheFind Feed" module removed According to [this](http://www.magentocommerce.com/magento-connect/thefind-feed-1.html) TheFind Feed module does not come with the latest versions of Magento( > 1.6). Thank you --- Magento.gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/Magento.gitignore b/Magento.gitignore index 3309871b..fce27ad8 100644 --- a/Magento.gitignore +++ b/Magento.gitignore @@ -1,10 +1,8 @@ .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/ app/design/frontend/base/ app/design/frontend/default/blank/ app/design/frontend/default/default/ @@ -13,7 +11,6 @@ app/design/frontend/default/modern/ app/design/frontend/enterprise/default app/design/install/ app/etc/modules/Enterprise_* -app/etc/modules/Find_Feed.xml app/etc/modules/Mage_All.xml app/etc/modules/Mage_Api.xml app/etc/modules/Mage_Api2.xml From d44417883f2bc9c93a643744c8bda32439683617 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 11 May 2014 12:59:57 +0200 Subject: [PATCH 39/41] Removed old ZendFramework.gitignore Documentation rules have been removed and the rest of the rules are going to be included in the ZendFramework2.gitignore. --- ZendFramework.gitignore | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 ZendFramework.gitignore diff --git a/ZendFramework.gitignore b/ZendFramework.gitignore deleted file mode 100644 index 014f93f6..00000000 --- a/ZendFramework.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -INSTALL.txt -LICENSE.txt -README.txt -demos/ -extras/documentation From 1d96081fc9dd50b5e8bac0cb6865b5152ed51cbc Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 11 May 2014 13:00:31 +0200 Subject: [PATCH 40/41] Included Zend Framework 1 rules --- ZendFramework2.gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ZendFramework2.gitignore b/ZendFramework2.gitignore index 6c7b29c7..cd248f53 100644 --- a/ZendFramework2.gitignore +++ b/ZendFramework2.gitignore @@ -14,3 +14,7 @@ logs/ cache/ temp/ tmp/ + +# ZF1 +demos/ +extras/documentation From ee1c7c01c1ee729afc281367d05c56f8ed577f64 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 11 May 2014 13:01:13 +0200 Subject: [PATCH 41/41] ZendFramework2.gitignore renamed to ZendFramework.gitignore --- ZendFramework2.gitignore => ZendFramework.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ZendFramework2.gitignore => ZendFramework.gitignore (100%) diff --git a/ZendFramework2.gitignore b/ZendFramework.gitignore similarity index 100% rename from ZendFramework2.gitignore rename to ZendFramework.gitignore