summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Lock around encrypted I/Ocmn/lock-ioCarlos Martín Nieto2015-05-229-10/+172
* Merge pull request #3108 from libgit2/cmn/ssl-no-wantEdward Thomson2015-05-221-16/+5
|\
| * openssl: don't try to handle WANT_READ or WANT_WRITEcmn/ssl-no-wantCarlos Martín Nieto2015-05-091-16/+5
* | travis: build maint branchesCarlos Martín Nieto2015-05-221-1/+1
* | Merge branch 'sni'Carlos Martín Nieto2015-05-211-0/+3
|\ \
| * | Call the openssl API to be able to work with SNI servers.Cristian Oneț2015-05-211-0/+3
* | | Merge pull request #3145 from stinb/fix_cxx_buildCarlos Martín Nieto2015-05-211-1/+1
|\ \ \
| * | | Fix error when building as C++.Jason Haslam2015-05-201-1/+1
* | | | Merge pull request #3146 from ethomson/add_untracked_filesCarlos Martín Nieto2015-05-212-1/+26
|\ \ \ \
| * | | | git_index_add_all: don't recurse ignored dirsEdward Thomson2015-05-201-2/+1
| * | | | index_add_all: include untracked files in new subdirsEdward Thomson2015-05-202-1/+27
| |/ / /
* | | | Merge pull request #3144 from libgit2/cmn/ignored-ignoreEdward Thomson2015-05-202-0/+13
|\ \ \ \ | |/ / / |/| | |
| * | | ignore: clear the error when matching a pattern negationcmn/ignored-ignoreCarlos Martín Nieto2015-05-202-0/+13
|/ / /
* | | Add a missing include for resetCarlos Martín Nieto2015-05-201-0/+1
* | | Merge pull request #3137 from libgit2/cmn/server-errorsCarlos Martín Nieto2015-05-205-3/+25
|\ \ \ | |/ / |/| |
| * | errors: add GIT_EEOF to indicate early EOFcmn/server-errorsCarlos Martín Nieto2015-05-205-4/+15
| * | ssh: read from stderr if stdout is emptyCarlos Martín Nieto2015-05-202-1/+12
|/ /
* | Merge pull request #3109 from libgit2/cmn/index-use-diffEdward Thomson2015-05-193-69/+118
|\ \
| * | index: add a CHANGELOG entry for the diff usagecmn/index-use-diffCarlos Martín Nieto2015-05-141-0/+3
| * | index: include TYPECHANGE in the diffCarlos Martín Nieto2015-05-142-1/+15
| * | index: make add_all to act on a diffCarlos Martín Nieto2015-05-141-80/+28
| * | index: refactor diff-based update_all to match other appliesCarlos Martín Nieto2015-05-141-80/+87
| * | index: use a diff to perform update_allCarlos Martín Nieto2015-05-141-2/+79
* | | Merge pull request #3132 from libgit2/cmn/path-direach-cberrorEdward Thomson2015-05-192-2/+8
|\ \ \
| * | | fileops: set an error on write error for file copycmn/path-direach-cberrorCarlos Martín Nieto2015-05-171-0/+3
| * | | fileops: set an error message if we fail to link a fileCarlos Martín Nieto2015-05-151-1/+2
| * | | path: don't let direach overwrite the callback's error messageCarlos Martín Nieto2015-05-151-1/+3
|/ / /
* | | Merge pull request #3130 from mortonfox/patch-1Carlos Martín Nieto2015-05-151-1/+1
|\ \ \
| * | | Updated dlibgit link.Morton Fox2015-05-141-1/+1
* | | | Merge pull request #3129 from Therzok/patch-2Carlos Martín Nieto2015-05-141-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Make "Early EOF" message start with lowercaseMarius Ungureanu2015-05-141-2/+2
|/ / /
* | | local: plug a leak in the progress reportingCarlos Martín Nieto2015-05-141-1/+5
* | | Merge pull request #3128 from libgit2/cmn/push-notify-deletedEdward Thomson2015-05-142-3/+118
|\ \ \ | |/ / |/| |
| * | push: fix the update constructorcmn/push-notify-deletedCarlos Martín Nieto2015-05-141-3/+4
| * | push: add tests for the push negotiation callbackCarlos Martín Nieto2015-05-141-0/+114
|/ /
* | Add CHANGELOG entry for index entry changesCarlos Martín Nieto2015-05-141-0/+5
* | Merge pull request #3119 from ethomson/ignoreCarlos Martín Nieto2015-05-133-39/+82
|\ \
| * | attr tests: make explicit our dir/file match testsEdward Thomson2015-05-131-12/+24
| * | attr: declare variable at top of block for msvcEdward Thomson2015-05-121-1/+3
| * | attr: less path mangling during attribute matchingEdward Thomson2015-05-121-40/+12
| * | attr: don't mangle file path during attr matchingEdward Thomson2015-05-121-3/+2
| * | attr: always return errorsEdward Thomson2015-05-121-1/+2
| * | attr: don't match files for foldersEdward Thomson2015-05-121-0/+8
| * | attr test: test a file beneath ignored folderEdward Thomson2015-05-121-1/+1
| * | attr: test that a file is not ignored for a folderEdward Thomson2015-05-121-0/+17
| * | attr: regression tests for ignore matchingEdward Thomson2015-05-121-0/+32
* | | Merge pull request #3103 from libgit2/cmn/local-push-messageEdward Thomson2015-05-132-58/+24
|\ \ \
| * | | tests: don't push to our resourcescmn/local-push-messageCarlos Martín Nieto2015-05-131-2/+2
| * | | local: use the packbuilder to pushCarlos Martín Nieto2015-05-131-55/+18
| * | | local: add clarification for non-bare push restrictionCarlos Martín Nieto2015-05-131-1/+4