From f4511ad9b62a7d4f56d30ee2f4fb8890d8932fc2 Mon Sep 17 00:00:00 2001 From: Alex Jordan Date: Sat, 22 Dec 2012 22:49:43 -0800 Subject: [PATCH 1/9] add a CONTRIBUTING.md file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add a CONTRIBUTING.md file, copied verbatim from the "Pull Requests" section in README.md --- CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..918dd5e3 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,3 @@ +Since this repo includes a large and diverse number of programming languages, frameworks, editors, and ecosystems, it's *very helpful* if you can provide a link to information supporting your pull request. Up-to-date, canonical documentation that mentions the files to be ignored is best. + +This ensures we can efficiently go through pull requests and keep quality high. From acce99efeed28e57bab6a740bf30ac6b47202731 Mon Sep 17 00:00:00 2001 From: Nysa Date: Wed, 6 Mar 2013 11:02:36 -0600 Subject: [PATCH 2/9] Ignore Vim untitled and unsaved buffer swapfiles Vim creates buffer swapfiles starting at .swp for buffers that are active but untitled and unsaved. --- Global/vim.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Global/vim.gitignore b/Global/vim.gitignore index 51514eb2..eadcec7a 100644 --- a/Global/vim.gitignore +++ b/Global/vim.gitignore @@ -1,4 +1,4 @@ -.*.s[a-w][a-z] +*.s[a-w][a-z] *.un~ Session.vim .netrwhist From 098aee26a1c69b0bf9e5723ee6db9589d21e74b0 Mon Sep 17 00:00:00 2001 From: Ted Nyman Date: Sat, 25 May 2013 23:56:08 -0600 Subject: [PATCH 3/9] Update LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 0f05796d..f247e598 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2012 GitHub, Inc. +Copyright (c) 2013 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 f2ab73150aa718b78e3d83e8897da05f33ad93a9 Mon Sep 17 00:00:00 2001 From: Andrew Nurse Date: Fri, 28 Jun 2013 16:44:00 -0700 Subject: [PATCH 4/9] Unignore "packages/*/build" in VisualStudio.gitignore. --- VisualStudio.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore index 99456160..0881b8de 100644 --- a/VisualStudio.gitignore +++ b/VisualStudio.gitignore @@ -15,6 +15,9 @@ build/ [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.* From 0acbcf4bfd827df09c9e1f97c2b9073d4a07a7df Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Tue, 2 Jul 2013 21:25:38 +0200 Subject: [PATCH 5/9] Adding CocoaPods to gitignore --- Objective-C.gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 31e6fd9a..5c579a76 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -15,3 +15,7 @@ profile DerivedData .idea/ *.hmap + +#CocoaPods +Podfile.lock +Pods From 444416f0678d0114b6901e69b6302d7db48ef04c Mon Sep 17 00:00:00 2001 From: Justin Spahr-Summers Date: Wed, 3 Jul 2013 08:28:28 -0700 Subject: [PATCH 6/9] Remove Podfile.lock from Objective-C ignores Per discussion in #148. --- Objective-C.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Objective-C.gitignore b/Objective-C.gitignore index 5c579a76..ebbef4bd 100644 --- a/Objective-C.gitignore +++ b/Objective-C.gitignore @@ -17,5 +17,4 @@ DerivedData *.hmap #CocoaPods -Podfile.lock Pods From d292bd8207a3aceb7e97a2517cc95cfec26aec66 Mon Sep 17 00:00:00 2001 From: Matt Jeffery Date: Fri, 19 Jul 2013 18:05:04 +0100 Subject: [PATCH 7/9] ignore kernel object files --- C.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/C.gitignore b/C.gitignore index 0331bbbd..9fa3b1bf 100644 --- a/C.gitignore +++ b/C.gitignore @@ -1,5 +1,6 @@ # Object files *.o +*.ko # Libraries *.lib From 0bad6cf48beabb5b257e953cdcab3a2fd610f404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aldo=20Rom=C3=A1n=20Nure=C3=B1a?= Date: Mon, 12 Aug 2013 12:40:19 -0500 Subject: [PATCH 8/9] added secret_token.rb I added secret_token.rb file to the gitignore as there are public repos sharing it. --- Rails.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Rails.gitignore b/Rails.gitignore index bf692e15..470ad2fc 100644 --- a/Rails.gitignore +++ b/Rails.gitignore @@ -16,3 +16,4 @@ capybara-*.html rerun.txt pickle-email-*.html .project +config/initializers/secret_token.rb From 5465b22fac179293c39543a3ea8f875d4eada8fe Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Wed, 28 Aug 2013 13:00:31 -0700 Subject: [PATCH 9/9] License these files under public domain Honestly, .gitignore files probably can't really be copyrighted in the first place. It probably falls under the _de minimus_ idea that they're too small and trivial. But to avoid confusion, something like the Unlicense which dedicates these files to the public domain in a clear and explicit manner to avoid confusion. This seems like the best approach for `.gitignore` files. --- LICENSE | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/LICENSE b/LICENSE index f247e598..68a49daa 100644 --- a/LICENSE +++ b/LICENSE @@ -1,19 +1,24 @@ -Copyright (c) 2013 GitHub, Inc. +This is free and unencumbered software released into the public domain. -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to