summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* SecureTransport: use the curl stream if availablecmn/curl-streamCarlos Martín Nieto2015-06-241-1/+17
* curl: remove the encrypted param to the constructorCarlos Martín Nieto2015-06-244-14/+6
* http: ask for the curl stream for non-encrypted connectionsCarlos Martín Nieto2015-06-241-4/+4
* openssl: use the curl stream if availableCarlos Martín Nieto2015-06-241-12/+110
* curl: extract certificate informationCarlos Martín Nieto2015-06-242-3/+46
* http: set the proxy if the stream supports itCarlos Martín Nieto2015-06-241-0/+11
* stream: add support for setting a proxyCarlos Martín Nieto2015-06-243-0/+32
* curl: add CHANGELOG and THREADING entriesCarlos Martín Nieto2015-06-242-9/+20
* Implement a curl streamCarlos Martín Nieto2015-06-243-1/+239
* curl: find and link with the library if it's available by defaultCarlos Martín Nieto2015-06-241-0/+11
* Merge pull request #3251 from git-up/fixesEdward Thomson2015-06-242-3/+3
|\
| * Fixed invalid error handling in git_repository_open_ext()Pierre-Olivier Latour2015-06-231-1/+1
| * Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-231-2/+2
|/
* Merge pull request #3222 from git-up/conflictedEdward Thomson2015-06-232-3/+34
|\
| * Fixed GIT_DELTA_CONFLICTED not returned in some casesPierre-Olivier Latour2015-06-232-3/+34
* | Merge pull request #3131 from urkud/const-charEdward Thomson2015-06-231-1/+1
|\ \
| * | Add `const` qualifierYury G. Kudryashov2015-05-151-1/+1
* | | Merge pull request #3226 from libgit2/cmn/racy-diff-againEdward Thomson2015-06-2310-45/+229
|\ \ \
| * | | Add a note about racy-git in CHANGELOGcmn/racy-diff-againCarlos Martín Nieto2015-06-221-0/+3
| * | | index: add a diff test for smudging a file which becomes emptyCarlos Martín Nieto2015-06-221-0/+43
| * | | tests: move racy tests to the indexCarlos Martín Nieto2015-06-221-4/+4
| * | | merge: work around write-side racy protection when hacking the indexCarlos Martín Nieto2015-06-221-1/+14
| * | | tests: set racy times manuallyCarlos Martín Nieto2015-06-221-6/+26
| * | | tests: plug leaks in the racy testCarlos Martín Nieto2015-06-221-1/+9
| * | | index: check racily clean entries more thoroughlyCarlos Martín Nieto2015-06-221-2/+41
| * | | diff: check files with the same or newer timestampsCarlos Martín Nieto2015-06-226-3/+61
* | | | Merge pull request #3249 from libgit2/cmn/repo-version-checkEdward Thomson2015-06-232-11/+50
|\ \ \ \ | |_|_|/ |/| | |
| * | | repository: check the format versioncmn/repo-version-checkCarlos Martín Nieto2015-06-232-9/+43
| * | | repository: don't error out if there is no versionCarlos Martín Nieto2015-06-231-2/+7
|/ / /
* | | Merge pull request #3228 from git-up/diff_mergeCarlos Martín Nieto2015-06-232-0/+47
|\ \ \
| * | | Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()Pierre-Olivier Latour2015-06-222-0/+47
|/ / /
* | | Merge pull request #3199 from ethomson/crlfCarlos Martín Nieto2015-06-221408-132/+8265
|\ \ \
| * | | crlf: give Unix the glory of autocrlf=trueEdward Thomson2015-06-221-13/+14
| * | | crlf tests: ensure that Unix obeys autocrlf=trueEdward Thomson2015-06-222-60/+17
| * | | git_buf_text_lf_to_crlf: allow mixed line endingsEdward Thomson2015-06-223-16/+36
| * | | crlf: use statistics to control to workdir filterEdward Thomson2015-06-221-4/+25
| * | | clar: support hierarchical test resource dataEdward Thomson2015-06-221-1/+14
| * | | crlf tests: posix known-good dataEdward Thomson2015-06-22684-0/+3960
| * | | crlf tests: windows known-good dataEdward Thomson2015-06-22685-0/+3961
| * | | crlf tests: use known-good data produced by gitEdward Thomson2015-06-221-36/+156
| * | | crlf: script to generate expected crlf dataEdward Thomson2015-06-221-0/+73
| * | | crlf: include utf8 resources in master branchEdward Thomson2015-06-2218-9/+11
| * | | crlf: include additional test resourcesEdward Thomson2015-06-2216-1/+6
|/ / /
* | | Merge pull request #3240 from libgit2/cmn/commit-header-fieldEdward Thomson2015-06-224-0/+107
|\ \ \
| * | | commit: allow retrieving an arbitrary header fieldcmn/commit-header-fieldCarlos Martín Nieto2015-06-224-0/+107
| |/ /
* | | Merge pull request #3239 from git-up/stash_indexCarlos Martín Nieto2015-06-221-0/+2
|\ \ \ | |/ / |/| |
| * | Write modified index in git_stash_apply()Pierre-Olivier Latour2015-06-211-0/+2
|/ /
* | Merge pull request #3233 from ethomson/status_typechangeCarlos Martín Nieto2015-06-204-12/+64
|\ \
| * | diff: preserve original mode in the indexEdward Thomson2015-06-203-12/+16
| * | status: test that symlinks don't lose their modeEdward Thomson2015-06-201-0/+48
|/ /