10000 Merge branch 'add-ignore-support-pr' into add-ignore-support · rlazev/libgit2sharp@d63f906 · GitHub
[go: up one dir, main page]
Skip to content

Commit d63f906

Browse files
anaisbettsanaisbetts
committed
Merge branch 'add-ignore-support-pr' into add-ignore-support
2 parents c00fdb8 + 3293748 commit d63f906

File tree

119 files changed

+3431
-1164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+3431
-1164
lines changed

‎.mailmap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Keith Dahlby <dahlbyk@gmail.com> <kdahlby@jpcycles.com>
2+
Jameson Miller <jamill@microsoft.com> <jameson.miller@live.com>
3+
Ben Straub <bs@github.com> <bstraub@github.com>
4+
Saaman <romain.magny@gmail.com>
5+
nulltoken <emeric.fermas@gmail.com>

‎.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ language: c
77
install:
88
- sudo apt-get install cmake mono-devel mono-gmcs
99

10-
# Run the Build script
10+
# Build libgit2, LibGit2Sharp and run the tests
1111
script:
1212
- git submodule update --init
1313
- mkdir cmake-build
@@ -16,9 +16,6 @@ script:
1616
- export LD_LIBRARY_PATH=$PWD/libgit2-bin/lib
1717
- cmake --build . --target install
1818
- cd ..
19-
20-
# Run Tests
21-
after_script:
2219
- xbuild CI-build.msbuild /t:Deploy
2320

2421
# Only watch the development branch

‎LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
Copyright (c) 2011-2012 LibGit2Sharp contributors
3+
Copyright (c) 2011-2013 LibGit2Sharp contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Lib/.gitattributes

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
* binary
1+
* binary
2+
.gitattributes text -binary
3+
*.txt text -binary

‎Lib/MoQ/License.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
Copyright (c) 2007. Clarius Consulting, Manas Technology Solutions, InSTEDD
2+
http://code.google.com/p/moq/
3+
All rights reserved.
4+
5+
Redistribution and use in source and binary forms,
6+
with or without modification, are permitted provided
7+
that the following conditions are met:
8+
9+
* Redistributions of source code must retain the
10+
above copyright notice, this list of conditions and
11+
the following disclaimer.
12+
13+
* Redistributions in binary form must reproduce
14+
the above copyright notice, this list of conditions
15+
and the following disclaimer in the documentation
16+
and/or other materials provided with the distribution.
17+
18+
* Neither the name of Clarius Consulting, Manas Technology Solutions or InSTEDD nor the
19+
names of its contributors may be used to endorse
20+
or promote products derived from this software
21+
without specific prior written permission.
22+
23+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
24+
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
25+
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
26+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
27+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
28+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
29+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
30+
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
31+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
32+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
33+
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
34+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
35+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36+
SUCH DAMAGE.
37+
38+
[This is the BSD license, see
39+
http://www.opensource.org/licenses/bsd-license.php]

‎Lib/NativeBinaries/amd64/git2.dll

49.5 KB
Binary file not shown.

‎Lib/NativeBinaries/amd64/git2.pdb

728 KB
Binary file not shown.

‎Lib/NativeBinaries/x86/git2.dll

37 KB
Binary file not shown.

‎Lib/NativeBinaries/x86/git2.pdb

240 KB
Binary file not shown.

‎Lib/NuGet/license.txt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
2+
3+
1. Definitions
4+
5+
The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.
6+
7+
A "contribution" is the original software, or any additions or changes to the software.
8+
9+
A "contributor" is any person that distributes its contribution under this license.
10+
11+
"Licensed patents" are a contributor's patent claims that read directly on its contribution.
12+
13+
2. Grant of Rights
14+
15+
(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
16+
17+
(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
18+
19+
3. Conditions and Limitations
20+
21+
(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
22+
23+
(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
24+
25+
(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
26+
27+
(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
28+
29+
(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.

0 commit comments

Comments
 (0)
0