Age | Commit message (Collapse) | Author | |
---|---|---|---|
2015-05-31 | Merge pull request #1063 from libgit2/ethomson/gitattributesHEADvNext | nulltoken | |
Remove union merge driver for sln, csproj files | |||
2015-05-30 | Remove union merge driver for sln, csproj files | Edward Thomson | |
The union merge driver is not appropriate for sln or csproj files. It is useful (as described by Junio) to "merge two shopping lists". This will work in trivial examples for sln and csproj files, for example when one branch adds a new file and the other branch does too, but it will often silently produce corrupt output. | |||
2015-05-29 | Merge pull request #1059 from libgit2/ethomson/mergeconflict | nulltoken | |
Introduce CheckoutConflictException | |||
2015-05-29 | Merge pull request #1058 from libgit2/ntk/issue_953 | nulltoken | |
Drop ThreadAffinity | |||
2015-05-29 | Drop ThreadAffinity | nulltoken | |
Fix #953 | |||
2015-05-29 | Merge pull request #1049 from libgit2/ntk/upgrade_nuget | nulltoken | |
Upgrade to libgit2 ff8d635 | |||
2015-05-29 | Update libgit2 to ff8d635 | nulltoken | |
https://github.com/libgit2/libgit2/compare/9bbc8f3...ff8d635 | |||
2015-05-29 | Fix wrong interop definition | nulltoken | |
2015-05-29 | Merge pull request #984 from bording/nativeNuget | nulltoken | |
Move native binaries into separate NuGet package | |||
2015-05-28 | Introduce CheckoutConflictException | Edward Thomson | |
Rename MergeConflictException to CheckoutConflictException, as merge conflicts are not a failure, only checkout conflicts are a failure. | |||
2015-05-27 | Merge pull request #942 from libgit2/ntk/history_rewriter_notes | nulltoken | |
Restrict potential reference targets of HistoryRewriter | |||
2015-05-27 | Merge pull request #527 from libgit2/ntk/filestatus | nulltoken | |
FileStatus names | |||
2015-05-27 | Merge pull request #1043 from libgit2/ntk/diff | nulltoken | |
Expose a more generic DiffAlgorithm property in CompareOptions | |||
2015-05-24 | Merge pull request #1038 from libgit2/Therzok-remove-forced-connection | nulltoken | |
Remove manual connection to remote | |||
2015-05-24 | Remove manual connection to remote | Marius Ungureanu | |
As seen in https://github.com/libgit2/libgit2/blob/master/src/remote.c#L2381-L2397 | |||
2015-05-23 | Merge pull request #1040 from libgit2/ntk/issue_1040 | nulltoken | |
All unit tests fail because of Mono.Unix.UnixPath in BuildPath | |||
2015-05-23 | Refactor unwrapping of temp repository on unix | Brandon Ording | |
Fix #1040 | |||
2015-05-23 | Obsolete CompareOptions.UsePatienceAlgorithm in favor of .Algorithm | nulltoken | |
Fix #1043 | |||
2015-05-23 | Merge pull request #1056 from libgit2/bording/failBuild | nulltoken | |
Make *nix builds fail at the first error | |||
2015-05-23 | Make *nix builds fail at the first error | Brandon Ording | |
Fixes #1055 | |||
2015-05-19 | Merge pull request #1052 from alessandro-gentilini/fix_typo | nulltoken | |
Fix typo | |||
2015-05-18 | Fix a typo in a comment. | Alessandro Gentilini | |
2015-05-18 | Fix a typo in a comment. | Alessandro Gentilini | |
2015-05-18 | Fix a typo in a comment. | Alessandro Gentilini | |
2015-05-18 | Fix a typo in a comment. | Alessandro Gentilini | |
2015-05-16 | Merge pull request #1050 from ckuhn203/secureCredentials | nulltoken | |
Added secure string support for credentials | |||
2015-05-16 | Use NativeBinaries package for libgit2 dependency | Brandon Ording | |
closes #974, closes #984 | |||
2015-05-16 | Added secure string support for credentials; closes #1048 | Chris McClellan | |
2015-05-15 | Merge pull request #1031 from libgit2/ntk/optionals | nulltoken | |
Ensure lack of optional parameters | |||
2015-05-15 | Fix Resharper private member prefix setting | Brendan Forster | |
2015-05-15 | Ensure lack of optional parameters | Brendan Forster | |
2015-05-15 | Drop optional parameters in Diff.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in BlobExtensions.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in BranchCollection.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in BranchCollectionExtensions.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in CommitRewriteInfo.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in Network.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in StashCollection.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in Configuration.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in ConfigurationExtensions.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in NetworkExtensions.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in ReferenceCollectionExtensions.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in TagCollectionExtensions.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in ObjectDatabase.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in ReferenceCollectionExtensions.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in RemoteCollection.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in Repository.cs | Brendan Forster | |
2015-05-15 | Drop optional parameters in RepositoryExtensions | Brendan Forster | |
2015-05-15 | Drop optional parameters in TagCollection | Brendan Forster | |
2015-05-13 | Merge pull request #1046 from richlander/patch-1 | nulltoken | |
Correct ".NET" usage |