From: W. Trevor King Date: Fri, 29 Nov 2013 23:01:13 +0000 (-0800) Subject: COPYING: Add the 2-clause BSD license for this project X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ac4438;p=swc-git-example.git COPYING: Add the 2-clause BSD license for this project The text is from http://opensource.org/licenses/BSD-2-Clause. I haven't made any local changes to the text yet, so the `` and `` markers are still there. I did wrap the original text to 70 columns to it's easier to read in narrow terminals (which are traditionally 80 characters wide). Because I'm not sure I want to use this license yet (maybe I'll use the MIT license instead?), I've started a new branch for this commit: $ git checkout -b bsd-license master That creates a new branch `bsd-license` based on the current `master` and checks out the new branch. You can see which branch you're usually on using `git branch`: $ git branch * bsd-license master mit-license The asterix marks the active branch. Once we've checked out the new branch, creating commits is just like it used to be: $ git add COPYING $ git commit Projects usually include licensing information like this explaining the terms under which others are allowed to make changes. The file is often called COPYING or LICENSE. The Open Source Initiative has a list of popular licenses [1], as does the Free Software Foundation [2]. The contents of this commit message are very similar to e8051dc (COPYING: Add MIT license for this project, 2013-11-29), but I don't expect both commits to be merged into the master branch. It's better to have a commit message that makes sense even for folks that don't have access to e8051dc in their repository. [1]: http://opensource.org/licenses/ [2]: http://www.gnu.org/licenses/license-list.html --- diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..780f5b6 --- /dev/null +++ b/COPYING @@ -0,0 +1,25 @@ +Copyright (c) , +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.