From 66a13f2e1591e1ef3626c3dabe2d4c18d3f6b732 Mon Sep 17 00:00:00 2001 From: Jota Junior Date: Tue, 12 Nov 2013 19:36:17 -0200 Subject: [PATCH 01/36] Gitignore file for Phalcon Framework, a fast-growing framework developed in C for PHP. Excluding here: - Cache files - Development config files More information available in phalconphp.com --- Phalcon.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Phalcon.gitignore diff --git a/Phalcon.gitignore b/Phalcon.gitignore new file mode 100644 index 00000000..1cfc0c9d --- /dev/null +++ b/Phalcon.gitignore @@ -0,0 +1,2 @@ +*/cache/* +*/config/development/* From 8f2db01f1d12df0f6d426c85aef1dc1cb1749350 Mon Sep 17 00:00:00 2001 From: Jota Junior Date: Mon, 2 Dec 2013 19:15:00 -0200 Subject: [PATCH 02/36] Remove astherisk before trailing slash --- Phalcon.gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Phalcon.gitignore b/Phalcon.gitignore index 1cfc0c9d..5eab0c56 100644 --- a/Phalcon.gitignore +++ b/Phalcon.gitignore @@ -1,2 +1,2 @@ -*/cache/* -*/config/development/* +/cache/* +/config/development/* From 70a475849d5928f2eb72bdb15d773eb60b415e63 Mon Sep 17 00:00:00 2001 From: Domenico Leone Luciani Date: Mon, 20 Jan 2014 17:27:15 +0100 Subject: [PATCH 03/36] Added gitignore to ignore sftp-config.json file --- SublimeTextSFTP.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 SublimeTextSFTP.gitignore diff --git a/SublimeTextSFTP.gitignore b/SublimeTextSFTP.gitignore new file mode 100644 index 00000000..4b2db0f7 --- /dev/null +++ b/SublimeTextSFTP.gitignore @@ -0,0 +1 @@ +sftp-config.json From c825cd2183ea88c37d2f27157d0e4664b69a0d83 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Mon, 17 Feb 2014 23:57:48 -0800 Subject: [PATCH 04/36] ignore web deploy settings by default web deploy settings include unencrypted passwords --- VisualStudio.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 9103a3f2..e2222a70 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -116,6 +116,8 @@ publish/ # Publish Web Output *.[Pp]ublish.xml *.azurePubxml +## TODO: Comment the next line if you want to checkin your web deploy settings but do not that will include unencrypted passwords +*.pubxml # NuGet Packages Directory ## TODO: If you have NuGet Package Restore enabled, uncomment the next line From fe589343ffa18059c317ac6d1639bbe20cde40aa Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Tue, 18 Feb 2014 00:06:21 -0800 Subject: [PATCH 05/36] fix typo, will squash commits later --- VisualStudio.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index e2222a70..1e381d18 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -116,7 +116,7 @@ publish/ # Publish Web Output *.[Pp]ublish.xml *.azurePubxml -## TODO: Comment the next line if you want to checkin your web deploy settings but do not 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 From 1f8466164330277fc8c9126ded3cc207ff3baf91 Mon Sep 17 00:00:00 2001 From: Tim Grilley Date: Thu, 27 Feb 2014 06:45:11 -0600 Subject: [PATCH 06/36] R.gitignore - Added .Rdata files --- R.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/R.gitignore b/R.gitignore index a0fd3b34..9a1509d5 100644 --- a/R.gitignore +++ b/R.gitignore @@ -3,3 +3,6 @@ # Example code in package build process *-Ex.R + +# R data files from past sessions +.Rdata From bc403c8675cc9b38d215998b50c0eae57a8aa5df Mon Sep 17 00:00:00 2001 From: Tim Grilley Date: Thu, 27 Feb 2014 07:06:43 -0600 Subject: [PATCH 07/36] TeX.gitignore - Updated to include ignores for intermediate sagetex and sympytex files --- TeX.gitignore | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/TeX.gitignore b/TeX.gitignore index f19b71f3..ee1e9f17 100644 --- a/TeX.gitignore +++ b/TeX.gitignore @@ -77,3 +77,14 @@ # xindy *.xdy + +# sagetex +*.sagetex.sage +*.sagetex.py +*.sagetex.scmd + +# sympy +*.sout +*.sympy +sympy-plots-for-*.tex/ + From b27768efcd8d8964646495b947246c0201b5abf4 Mon Sep 17 00:00:00 2001 From: Tim Grilley Date: Fri, 28 Feb 2014 11:16:13 -0600 Subject: [PATCH 08/36] Update TeX.gitignore to be in alphabetical order --- TeX.gitignore | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/TeX.gitignore b/TeX.gitignore index ee1e9f17..24052950 100644 --- a/TeX.gitignore +++ b/TeX.gitignore @@ -72,12 +72,6 @@ # nomencl *.nlo -# todonotes -*.tdo - -# xindy -*.xdy - # sagetex *.sagetex.sage *.sagetex.py @@ -88,3 +82,10 @@ *.sympy sympy-plots-for-*.tex/ +# todonotes +*.tdo + +# xindy +*.xdy + + From e8d7cafc16053ef564fd2e9e16e63c73c8fade76 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Sat, 8 Mar 2014 00:45:00 -0800 Subject: [PATCH 09/36] Update Dart.gitignore - add the `build/` directory to the .gitignore list (now created by pub). - add the `.dart.precompiled.js` files (created by dart2js) to the ignore list. And, sort and re-order the file. --- Dart.gitignore | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Dart.gitignore b/Dart.gitignore index 602616ce..74a3439f 100644 --- a/Dart.gitignore +++ b/Dart.gitignore @@ -1,11 +1,13 @@ -# Don’t commit the following files and directories created by pub and dart2js +# Don’t commit the following directories created by pub. +build/ packages/ + +# Or the files created by dart2js. +*.dart.js +*.dart.precompiled.js *.js_ *.js.deps *.js.map -# Include when developing application packages +# Include when developing application packages. pubspec.lock - -# Avoid committing generated JavaScript files -*.dart.js From 2fcafd7140770b8dc623e10d26480eea54994eff Mon Sep 17 00:00:00 2001 From: Takahiro OKUMURA Date: Sun, 9 Mar 2014 14:35:00 +0900 Subject: [PATCH 10/36] Add a support for packer http://www.packer.io/ --- Packer.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Packer.gitignore diff --git a/Packer.gitignore b/Packer.gitignore new file mode 100644 index 00000000..1b7a03ef --- /dev/null +++ b/Packer.gitignore @@ -0,0 +1,5 @@ +# Cache objects +packer_cache/ + +# For built boxes +*.box From 7609a2eb31b0821dc025ad0159289056c284c115 Mon Sep 17 00:00:00 2001 From: Kyle Fuller Date: Thu, 13 Mar 2014 09:28:13 +0000 Subject: [PATCH 11/36] [Objective-C] Remove CocoaPods ignores We shouldn't be ignoring these, it's down to the user and we shouldn't enforce them to ignore the `Pods/` directory http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control? --- Objective-C.gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/Objective-C.gitignore b/Objective-C.gitignore index ecb86fa7..f0550a51 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -15,6 +15,3 @@ profile DerivedData *.hmap *.ipa - -# CocoaPods -Pods From b1c89277877bee64d08e99ba86f63dbdd077cc24 Mon Sep 17 00:00:00 2001 From: Dmitry Teslitsky Date: Sat, 15 Mar 2014 22:46:14 +0200 Subject: [PATCH 12/36] Create OpenCart.gitignore Ignore OpenCart config files, images, cache and logs. --- OpenCart.gitignore | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 OpenCart.gitignore diff --git a/OpenCart.gitignore b/OpenCart.gitignore new file mode 100644 index 00000000..f3179125 --- /dev/null +++ b/OpenCart.gitignore @@ -0,0 +1,7 @@ +.htaccess +config.php +download/ +image/data/ +image/cache/ +system/cache/ +system/logs/ From f96f48347de8511600787512efcf647ee4b49fde Mon Sep 17 00:00:00 2001 From: John Munkhoff Date: Sun, 16 Mar 2014 23:04:52 -0700 Subject: [PATCH 13/36] Update Qt.gitignore - Ignore '*.moc' files (foo.moc created when foo.cpp contains a Q_OBJECT.) - Ignore '/.qmake.cache' and '/.qmake.stash' as does the official Qt Creator project. --- Qt.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Qt.gitignore b/Qt.gitignore index 29d98c9e..623e5fea 100644 --- a/Qt.gitignore +++ b/Qt.gitignore @@ -12,8 +12,11 @@ # Qt-es +/.qmake.cache +/.qmake.stash *.pro.user *.pro.user.* +*.moc moc_*.cpp qrc_*.cpp ui_*.h From a3fbb9bd29a03bcf0ae0dd50c6e7a9e3d72299da Mon Sep 17 00:00:00 2001 From: Kyle Fuller Date: Tue, 18 Mar 2014 15:40:11 +0000 Subject: [PATCH 14/36] [Objective-C] Add a note about CocoaPod's Pods/ --- Objective-C.gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Objective-C.gitignore b/Objective-C.gitignore index f0550a51..fd2593dd 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -15,3 +15,12 @@ profile DerivedData *.hmap *.ipa + +# CocoaPods +# +# 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? +# +# Pods/ + From a65b95938c393e509fd5f8cda63d094c43828947 Mon Sep 17 00:00:00 2001 From: John Munkhoff Date: Tue, 18 Mar 2014 16:21:03 -0700 Subject: [PATCH 15/36] Add Global/SlickEdit.gitignore file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit adds a global ignore file for SlickEdit, a commercial editor. SlickEdit will create the following files when the user sets up a workspace: *.vpw Workspace file. Contains a list of project files associated with the workspace. *.vpj Project file. Contains the project’s settings, including the list of source files. *.vpwhist Workspace history file for Windows. Contains user session information (list of open files, debugger breakpoints, etc.) *.vpwhistu Workspace history file for UNIX/Linux/MacOSX. (Same as above.) *.vtg Workspace tag file. Contains a database of source code symbols. It is assumed that GitHub users will generally not want to store their workspace and project files in a repository, so those files are ignored globally. However, those files do not contain user-specific data so they could be stored in a repository and shared among developers if desired for a particular project. This can be done by adding rules like ’!*.vpw’ and ‘!*.vpj’ to the project’s .gitignore file. The workspace history and tag files contain user-specific data, so they should not be stored in a repository. For more information, download the PDF user guide from: http://www.slickedit.com/products/slickedit/product-documentation Note: The user guide is 1400 pages long and over 13MB in size. Searching for ‘vpwhist’ will lead to the section that discusses storing these files in a repository. --- Global/SlickEdit.gitignore | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Global/SlickEdit.gitignore diff --git a/Global/SlickEdit.gitignore b/Global/SlickEdit.gitignore new file mode 100644 index 00000000..e3d960ac --- /dev/null +++ b/Global/SlickEdit.gitignore @@ -0,0 +1,20 @@ +# SlickEdit workspace and project files are ignored by default because +# typically they are considered to be developer-specific and not part of a +# project. However, if multiple SlickEdit users are collaborating on a +# project, it is possible to store these files in the repository and share +# them among all developers because they do not contain user-specific data. +# To store these files in a repository, add the following two lines to the +# project’s .gitignore file: +# ---------- +# !*.vpw +# !*.vpj +# ---------- +*.vpw +*.vpj + +# SlickEdit workspace history and tag files always contain user-specific +# data so they should not be stored in a repository. +*.vpwhistu +*.vpwhist +*.vtg + From ddcbdd6a17e2daa1584debb5b6db37921655a241 Mon Sep 17 00:00:00 2001 From: John Munkhoff Date: Tue, 18 Mar 2014 23:37:25 -0700 Subject: [PATCH 16/36] Edit comment in Global/SlickEdit.gitignore Remove unnecessary wording about negative ignore rules. --- Global/SlickEdit.gitignore | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Global/SlickEdit.gitignore b/Global/SlickEdit.gitignore index e3d960ac..9e2fdda8 100644 --- a/Global/SlickEdit.gitignore +++ b/Global/SlickEdit.gitignore @@ -1,14 +1,6 @@ # SlickEdit workspace and project files are ignored by default because # typically they are considered to be developer-specific and not part of a -# project. However, if multiple SlickEdit users are collaborating on a -# project, it is possible to store these files in the repository and share -# them among all developers because they do not contain user-specific data. -# To store these files in a repository, add the following two lines to the -# project’s .gitignore file: -# ---------- -# !*.vpw -# !*.vpj -# ---------- +# project. *.vpw *.vpj From 5bd4330b8ca3302fa43b64db629a8d6d2a624a3e Mon Sep 17 00:00:00 2001 From: "MacPro: Fabien Sanglard" Date: Wed, 19 Mar 2014 19:14:15 -0400 Subject: [PATCH 17/36] Add Xcode support. --- Global/Xcode.gitignore | 17 +++++++++++++++++ Objective-C.gitignore | 18 ------------------ 2 files changed, 17 insertions(+), 18 deletions(-) create mode 100644 Global/Xcode.gitignore diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore new file mode 100644 index 00000000..086d143d --- /dev/null +++ b/Global/Xcode.gitignore @@ -0,0 +1,17 @@ +build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata +*.xccheckout +profile +*.moved-aside +DerivedData +*.hmap +*.ipa + diff --git a/Objective-C.gitignore b/Objective-C.gitignore index fd2593dd..d522f941 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -1,21 +1,3 @@ -# Xcode -build/ -*.pbxuser -!default.pbxuser -*.mode1v3 -!default.mode1v3 -*.mode2v3 -!default.mode2v3 -*.perspectivev3 -!default.perspectivev3 -xcuserdata -*.xccheckout -profile -*.moved-aside -DerivedData -*.hmap -*.ipa - # CocoaPods # # We recommend against adding the Pods directory to your .gitignore. However From a6cabefb87e10e7a945d5b765d6637a192c7ecbe Mon Sep 17 00:00:00 2001 From: Torben Werner Date: Fri, 21 Mar 2014 12:46:27 +1100 Subject: [PATCH 18/36] Increase the specificity of PlayFramework rules The original ignore was far too general and results in eliminating packages named "db" or "project", for example. These are not that uncommon for package names. Fixes #921. --- PlayFramework.gitignore | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/PlayFramework.gitignore b/PlayFramework.gitignore index 3bf02289..4735f055 100644 --- a/PlayFramework.gitignore +++ b/PlayFramework.gitignore @@ -1,19 +1,17 @@ # Ignore Play! working directory # -bin -db -eclipse -lib -log -logs -modules -precompiled -project/project -project/target -target -tmp +bin/ +/db +.eclipse +/lib/ +/logs/ +/modules +/project/project +/project/target +/target +tmp/ test-result server.pid *.iml *.eml -dist +/dist/ .cache From af6b1895ddb7fbf84bee8d66fe4a46553bf3d4ab Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Fri, 21 Mar 2014 12:57:41 +1100 Subject: [PATCH 19/36] Remove trailing asterisks in Phalcon rules --- Phalcon.gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Phalcon.gitignore b/Phalcon.gitignore index 5eab0c56..6ffe3aa2 100644 --- a/Phalcon.gitignore +++ b/Phalcon.gitignore @@ -1,2 +1,2 @@ -/cache/* -/config/development/* +/cache/ +/config/development/ From 22e99e7a8960f415275c321842dc7ec877916603 Mon Sep 17 00:00:00 2001 From: Francisco Pina Martins Date: Fri, 21 Mar 2014 15:23:57 +0000 Subject: [PATCH 20/36] Added other common compression formats. --- ArchLinuxPackages.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ArchLinuxPackages.gitignore b/ArchLinuxPackages.gitignore index 77aed91a..6cf5bf83 100644 --- a/ArchLinuxPackages.gitignore +++ b/ArchLinuxPackages.gitignore @@ -1,5 +1,7 @@ *.tar *.tar.* +*.zip +*.tgz *.log *.log.* *.sig From e5e18e6e53bfb23472de43ca293b7972c5d81101 Mon Sep 17 00:00:00 2001 From: notbear Date: Mon, 24 Mar 2014 17:14:52 +0100 Subject: [PATCH 21/36] Fixes uncomplete CTools Ignoring cache/ makes also necessary files ignored: modules/ctools/page_manager/plugins/cache/page_manager_context.inc modules/ctools/plugins/cache/simple.inc modules/ctools/plugins/cache/export_ui.inc See: https://drupal.org/comment/7001628#comment-7001628 --- Drupal.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Drupal.gitignore b/Drupal.gitignore index a14c765d..04aed3b6 100644 --- a/Drupal.gitignore +++ b/Drupal.gitignore @@ -2,7 +2,6 @@ sites/*/*settings*.php # Ignore paths that contain generated content. -cache/ files/ sites/*/files sites/*/private From 485a600a77ef3ec768ca3719ede1d1172e3cbcbb Mon Sep 17 00:00:00 2001 From: Steven Noto Date: Tue, 25 Mar 2014 15:14:14 -0500 Subject: [PATCH 22/36] Added bin-release folder Updated to include 'bin-release' folder, another folder for generated binary builds --- Global/FlexBuilder.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Global/FlexBuilder.gitignore b/Global/FlexBuilder.gitignore index b6ce3f1e..bbbfb91d 100644 --- a/Global/FlexBuilder.gitignore +++ b/Global/FlexBuilder.gitignore @@ -1,2 +1,3 @@ bin/ bin-debug/ +bin-release/ From b7d5856485ea69f326c299a26d58418c0bd198f3 Mon Sep 17 00:00:00 2001 From: "Carpii (iMac)" Date: Wed, 26 Mar 2014 12:40:20 +0000 Subject: [PATCH 23/36] Updated OSX.gitignore to include directories commonly created on AFP shares --- Global/OSX.gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore index 65b94232..2faefcf6 100644 --- a/Global/OSX.gitignore +++ b/Global/OSX.gitignore @@ -11,3 +11,10 @@ Icon # Files that might appear on external disk .Spotlight-V100 .Trashes + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items + From 1fb5ad47f452ebc1dad26366ff3d89b854c7cd4d Mon Sep 17 00:00:00 2001 From: Ivan Zuzak Date: Thu, 27 Mar 2014 17:04:02 +0100 Subject: [PATCH 24/36] fixup OpenCart double-file situation --- OpenCart.gitignore | 4 ++++ opencart.gitignore | 10 ---------- 2 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 opencart.gitignore diff --git a/OpenCart.gitignore b/OpenCart.gitignore index f3179125..6d72b17d 100644 --- a/OpenCart.gitignore +++ b/OpenCart.gitignore @@ -1,5 +1,9 @@ .htaccess config.php +admin/config.php + +!index.html + download/ image/data/ image/cache/ diff --git a/opencart.gitignore b/opencart.gitignore deleted file mode 100644 index c673f1f8..00000000 --- a/opencart.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -config.php -admin/config.php - -!index.html - -download -image/cache/*.jpg -image/cache/data/* -system/cache -system/logs From 5342e13bc99d1e106b4d5f7bc9e9deaa0c58543e Mon Sep 17 00:00:00 2001 From: Ivan Zuzak Date: Thu, 27 Mar 2014 17:04:56 +0100 Subject: [PATCH 25/36] ensure single trailing newline --- Ada.gitignore | 2 +- DM.gitignore | 2 +- EPiServer.gitignore | 2 +- Fancy.gitignore | 2 +- Global/Ensime.gitignore | 2 +- Global/Lazarus.gitignore | 2 +- Global/NotepadPP.gitignore | 2 +- Global/SlickEdit.gitignore | 1 - Global/Xcode.gitignore | 1 - Meteor.gitignore | 2 +- Prestashop.gitignore | 2 +- TeX.gitignore | 2 -- VVVV.gitignore | 1 - 13 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Ada.gitignore b/Ada.gitignore index af635597..b4d70396 100644 --- a/Ada.gitignore +++ b/Ada.gitignore @@ -2,4 +2,4 @@ *.o # Ada Library Information -*.ali \ No newline at end of file +*.ali diff --git a/DM.gitignore b/DM.gitignore index 34f782a7..ba5abdab 100644 --- a/DM.gitignore +++ b/DM.gitignore @@ -2,4 +2,4 @@ *.rsc *.int *.lk -*.zip \ No newline at end of file +*.zip diff --git a/EPiServer.gitignore b/EPiServer.gitignore index ca7a7862..97037de7 100644 --- a/EPiServer.gitignore +++ b/EPiServer.gitignore @@ -1,4 +1,4 @@ ###################### ## EPiServer Files ###################### -*License.config \ No newline at end of file +*License.config diff --git a/Fancy.gitignore b/Fancy.gitignore index 6b345074..70d6e631 100644 --- a/Fancy.gitignore +++ b/Fancy.gitignore @@ -1,2 +1,2 @@ *.rbc -*.fyc \ No newline at end of file +*.fyc diff --git a/Global/Ensime.gitignore b/Global/Ensime.gitignore index 6d8c2b09..3772bdfe 100644 --- a/Global/Ensime.gitignore +++ b/Global/Ensime.gitignore @@ -1,3 +1,3 @@ # Ensime specific .ensime -.ensime_lucene/ \ No newline at end of file +.ensime_lucene/ diff --git a/Global/Lazarus.gitignore b/Global/Lazarus.gitignore index e7149354..0ea9e189 100644 --- a/Global/Lazarus.gitignore +++ b/Global/Lazarus.gitignore @@ -9,4 +9,4 @@ lib/ *.ppu #exclude executable output in windows -*.exe \ No newline at end of file +*.exe diff --git a/Global/NotepadPP.gitignore b/Global/NotepadPP.gitignore index 9ec9df15..8fbda83a 100644 --- a/Global/NotepadPP.gitignore +++ b/Global/NotepadPP.gitignore @@ -1,2 +1,2 @@ # Notepad++ backups # -*.bak \ No newline at end of file +*.bak diff --git a/Global/SlickEdit.gitignore b/Global/SlickEdit.gitignore index 9e2fdda8..f30b8da4 100644 --- a/Global/SlickEdit.gitignore +++ b/Global/SlickEdit.gitignore @@ -9,4 +9,3 @@ *.vpwhistu *.vpwhist *.vtg - diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore index 086d143d..3756dc05 100644 --- a/Global/Xcode.gitignore +++ b/Global/Xcode.gitignore @@ -14,4 +14,3 @@ profile DerivedData *.hmap *.ipa - diff --git a/Meteor.gitignore b/Meteor.gitignore index 6a6ea0e5..0167b87c 100644 --- a/Meteor.gitignore +++ b/Meteor.gitignore @@ -1,2 +1,2 @@ .meteor/local -.meteor/meteorite \ No newline at end of file +.meteor/meteorite diff --git a/Prestashop.gitignore b/Prestashop.gitignore index e957df94..890c4e60 100644 --- a/Prestashop.gitignore +++ b/Prestashop.gitignore @@ -26,4 +26,4 @@ themes/default/cache/*.css # Ignore files on root directory robots.txt -sitemap.xml \ No newline at end of file +sitemap.xml diff --git a/TeX.gitignore b/TeX.gitignore index 24052950..91b15a2a 100644 --- a/TeX.gitignore +++ b/TeX.gitignore @@ -87,5 +87,3 @@ sympy-plots-for-*.tex/ # xindy *.xdy - - diff --git a/VVVV.gitignore b/VVVV.gitignore index 55a6a4b7..5df43246 100644 --- a/VVVV.gitignore +++ b/VVVV.gitignore @@ -4,4 +4,3 @@ # Dynamic plugins .dll bin/ - From 3244810432d214f85791b5dced07d3ab0aca7435 Mon Sep 17 00:00:00 2001 From: Namik Nuhanovic Date: Mon, 31 Mar 2014 02:52:46 +0200 Subject: [PATCH 26/36] Add 'pom.xml.versionsBackup' 'mvn versions:use-latest-versions' generates 'pom.xml.versionsBackup' file, because '-DgenerateBackupPoms=true' is default; see http://mojo.codehaus.org/versions-maven-plugin/use-latest-versions-mojo.html#generateBackupPoms --- Maven.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Maven.gitignore b/Maven.gitignore index 94eab12d..088836b5 100644 --- a/Maven.gitignore +++ b/Maven.gitignore @@ -1,5 +1,6 @@ target/ pom.xml.tag pom.xml.releaseBackup +pom.xml.versionsBackup pom.xml.next release.properties From 321f8518594b5b38ef1e76e48b882f47375f095e Mon Sep 17 00:00:00 2001 From: ONion Date: Mon, 31 Mar 2014 11:07:06 +0800 Subject: [PATCH 27/36] add delphi .dcu .DCU (Delphi Compiled Unit) files are binary files that are used between compiling source (text) and linking the executable. They're created by the compiler, joined together in memory, combined with the startup code and put into an actual executable (.EXE/.DLL/.BPL) by the linker --- Delphi.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Delphi.gitignore b/Delphi.gitignore index e186b94c..2dd677c1 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -50,3 +50,4 @@ # Delphi history and backups __history/ *.~* +*.dcu From 28c78172be104d08f0eb422ea7300589cbb59d8a Mon Sep 17 00:00:00 2001 From: ONion Date: Mon, 31 Mar 2014 11:25:08 +0800 Subject: [PATCH 28/36] change ignore file position --- Delphi.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Delphi.gitignore b/Delphi.gitignore index 2dd677c1..d80e5cb3 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -35,6 +35,7 @@ *.dres *.rsm *.tds +*.dcu # Delphi autogenerated files (duplicated info) *.cfg @@ -50,4 +51,4 @@ # Delphi history and backups __history/ *.~* -*.dcu + From b8051dba2f753e2961adc08ac6ca916ecd5938ed Mon Sep 17 00:00:00 2001 From: ONion Date: Mon, 31 Mar 2014 11:49:00 +0800 Subject: [PATCH 29/36] trim --- Delphi.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Delphi.gitignore b/Delphi.gitignore index d80e5cb3..72fe0925 100644 --- a/Delphi.gitignore +++ b/Delphi.gitignore @@ -51,4 +51,3 @@ # Delphi history and backups __history/ *.~* - From 9707fd125c5e7567c1bc6fa1f75a69bac4508062 Mon Sep 17 00:00:00 2001 From: Konstantin Koval Date: Mon, 31 Mar 2014 08:37:35 +0200 Subject: [PATCH 30/36] put back Xcode ignore to Objective-C. --- Objective-C.gitignore | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Objective-C.gitignore b/Objective-C.gitignore index d522f941..278782fc 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -1,3 +1,22 @@ +# Xcode +# +build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata +*.xccheckout +profile +*.moved-aside +DerivedData +*.hmap +*.ipa + # CocoaPods # # We recommend against adding the Pods directory to your .gitignore. However From d6ffb3cac30c0b338dadebfb13e1403a4029da61 Mon Sep 17 00:00:00 2001 From: Jamie Humphries Date: Thu, 3 Apr 2014 18:20:45 +0100 Subject: [PATCH 31/36] Do not ignore .ncrunch* in Visual Studio projects. This was ignoring .ncrunchproject and .ncrunchsolution files. NCrunch recommend that both of these files are checked in to source control. --- VisualStudio.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 748683d0..cd481632 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -91,7 +91,6 @@ _TeamCity* *.dotCover # NCrunch -*.ncrunch* _NCrunch_* .*crunch*.local.xml From d598b29b04497c3400f86b6599aabc59ec054196 Mon Sep 17 00:00:00 2001 From: Jim Roepcke Date: Fri, 4 Apr 2014 17:21:06 +1100 Subject: [PATCH 32/36] Remove profile rule from Xcode template. Fixes #956 --- Global/Xcode.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore index 3756dc05..3dad88c9 100644 --- a/Global/Xcode.gitignore +++ b/Global/Xcode.gitignore @@ -9,7 +9,6 @@ build/ !default.perspectivev3 xcuserdata *.xccheckout -profile *.moved-aside DerivedData *.hmap From 1314783d11188b454ad4c65fc192c9ea999faedc Mon Sep 17 00:00:00 2001 From: Domenico LucianI Date: Fri, 4 Apr 2014 12:01:26 +0200 Subject: [PATCH 33/36] Moved to global --- Global/SublimeText.gitignore | 3 +++ SublimeTextSFTP.gitignore | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 SublimeTextSFTP.gitignore diff --git a/Global/SublimeText.gitignore b/Global/SublimeText.gitignore index e5bfb723..77b2848a 100644 --- a/Global/SublimeText.gitignore +++ b/Global/SublimeText.gitignore @@ -4,3 +4,6 @@ # project files should be checked into the repository, unless a significant # proportion of contributors will probably not be using SublimeText # *.sublime-project + +#sftp configuration file +sftp-config.json diff --git a/SublimeTextSFTP.gitignore b/SublimeTextSFTP.gitignore deleted file mode 100644 index 4b2db0f7..00000000 --- a/SublimeTextSFTP.gitignore +++ /dev/null @@ -1 +0,0 @@ -sftp-config.json From 9d4978d1c8e7dedd199576b28980bf9d5906d7d3 Mon Sep 17 00:00:00 2001 From: Adrian Rangel Date: Fri, 4 Apr 2014 16:25:30 -0600 Subject: [PATCH 34/36] add notice about secret files --- Rails.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Rails.gitignore b/Rails.gitignore index 1a2c94dc..c5c092be 100644 --- a/Rails.gitignore +++ b/Rails.gitignore @@ -10,6 +10,8 @@ capybara-*.html **.orig rerun.txt pickle-email-*.html + +# TODO Comment out this rules if you are OK with secrets been uploaded to the repo config/initializers/secret_token.rb config/secrets.yml From 336dd397ffc23f66107bf7c71195e4578bb761d7 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Sun, 6 Apr 2014 10:35:58 +1000 Subject: [PATCH 35/36] Remove profile from Obj-C to match #956 --- Objective-C.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 278782fc..35a6fbdd 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -11,7 +11,6 @@ build/ !default.perspectivev3 xcuserdata *.xccheckout -profile *.moved-aside DerivedData *.hmap From 5f4223833162b45377e9900b6da8340f5992dc82 Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Sun, 6 Apr 2014 10:38:24 +1000 Subject: [PATCH 36/36] Remove Obj-C-specific hmap & ipa from general Xcode template --- Global/Xcode.gitignore | 2 -- Objective-C.gitignore | 1 - 2 files changed, 3 deletions(-) diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore index 3756dc05..30986799 100644 --- a/Global/Xcode.gitignore +++ b/Global/Xcode.gitignore @@ -12,5 +12,3 @@ xcuserdata profile *.moved-aside DerivedData -*.hmap -*.ipa diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 35a6fbdd..8f9935da 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -23,4 +23,3 @@ DerivedData # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control? # # Pods/ -