summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rename FALLBACK to UNSPECIFIEDcmn/rename-unspecifiedCarlos Martín Nieto2015-06-2513-26/+26
* Merge pull request #3097 from libgit2/cmn/submodule-config-stateCarlos Martín Nieto2015-06-2420-1015/+616
|\
| * submodule: remove the RESET enum valuescmn/submodule-config-stateCarlos Martín Nieto2015-06-222-9/+1
| * submodule: test unsetting config optionsCarlos Martín Nieto2015-06-221-13/+29
| * submodule: handle writing out all enum values for settingsCarlos Martín Nieto2015-06-222-65/+21
| * config: provide a function to reverse-lookup mapped cvarsCarlos Martín Nieto2015-06-222-0/+26
| * examples: adjust to submodule status API changeCarlos Martín Nieto2015-06-221-16/+10
| * submodule: test more accurately for non-existenceCarlos Martín Nieto2015-06-221-4/+4
| * submodule: fix potential leak in the testsCarlos Martín Nieto2015-06-221-2/+1
| * submodule: get rid of `_save()`Carlos Martín Nieto2015-06-223-61/+0
| * submodule: make `_set_url()` affect the configurationCarlos Martín Nieto2015-06-224-61/+17
| * submodule: make `_set_branch()` affect the configurationCarlos Martín Nieto2015-06-223-70/+53
| * submodule: make `_set_update_fetch_recurse_submodules()` affect the configCarlos Martín Nieto2015-06-223-53/+49
| * submodule: make `_set_update()` affect the configurationCarlos Martín Nieto2015-06-223-58/+47
| * submodule: correct detection of existing submodulesCarlos Martín Nieto2015-06-221-10/+26
| * submodule: bring back finding by pathCarlos Martín Nieto2015-06-221-0/+42
| * submodule: add an ignore option to statusCarlos Martín Nieto2015-06-2210-61/+50
| * submodule: don't let status change an existing instanceCarlos Martín Nieto2015-06-226-24/+44
| * submodule: make set_ignore() affect the configurationCarlos Martín Nieto2015-06-225-56/+50
| * submodule: remove the per-repo cacheCarlos Martín Nieto2015-06-227-576/+270
* | Merge pull request #3183 from libgit2/cmn/curl-streamCarlos Martín Nieto2015-06-2411-23/+475
|\ \
| * | 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 #3254 from ethomson/diff-binary-patchCarlos Martín Nieto2015-06-243-12/+69
|\ \ \
| * | | diff: determine DIFFABLE-ness for binariesEdward Thomson2015-06-242-12/+32
| * | | diff::binary tests: empty diff when forced binaryEdward Thomson2015-06-241-0/+30
| * | | binary diff: test that the diff and patch otputs are the samecmn/diff-binary-patchCarlos Martín Nieto2015-06-241-0/+7
| |/ /
* | | Merge pull request #3250 from ethomson/stashCarlos Martín Nieto2015-06-246-71/+95
|\ \ \ | |/ / |/| |
| * | stash: save the workdir file when deleted in indexEdward Thomson2015-06-233-14/+46
| * | stash tests: ensure we save the workdir fileEdward Thomson2015-06-233-11/+26
| * | git_diff__merge: allow pluggable diff mergesEdward Thomson2015-06-232-3/+19
| * | diff_tform: remove reversed copy of delta mergerEdward Thomson2015-06-231-46/+7
* | | 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